This commit was manufactured by cvs2svn to create tag 'v20060105_1352'.
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 cdb6c50..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build.xml
-org.eclipse.jst.ejb.doc.user_1.0.0.jar
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/META-INF/MANIFEST.MF b/docs/org.eclipse.jst.ejb.doc.user/META-INF/MANIFEST.MF
deleted file mode 100644
index 2db2387..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.0.0
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Eclipse-AutoStart: 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 4c99086..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.ejb.doc.user/build.properties b/docs/org.eclipse.jst.ejb.doc.user/build.properties
deleted file mode 100644
index a5f66a2..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-bin.includes = ejb_toc.xml,\
- images/,\
- plugin.xml,\
- topics/,\
- about.html,\
- META-INF,\
- /,\
- topics/,\
- plugin.xml,\
- plugin.properties,\
- images/,\
- ejb_toc.xml,\
- about.html,\
- META-INF/
- plugin.properties/
-src.includes = build.properties
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 fd0b098..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/ejb_toc.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<toc label="EJB applications" topic="topics/ceover.html">
- <topic label="EJB application development" href="topics/ceover.html">
- <topic label="EJB architecture" href="topics/cearch.html"/>
- <topic label="EJB development resources" href="topics/ceresrc.html"/>
- </topic>
- <topic label="Creating EJB projects" href="topics/tecrtpro.html">
- <topic label="EJB client JAR projects" href="topics/ceclientjars.html"/>
- </topic>
- <topic label="Importing EJB JAR files" href="topics/teimp.html"/>
- <topic label="Exporting EJB projects to EJB JAR files" href="topics/teexp.html"/>
- <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 message-driven beans with XDoclet annotation support" href="topics/temessb.html"/>
- <topic label="Configuring XDoclet annotation support" href="topics/txdocletconf.html"/>
- </topic>
-</toc>
\ No newline at end of file
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/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 c559e6c..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.0"?>
-<?NLS TYPE="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<!-- ================================================= -->
-<!-- This is the plugin for declaring the help -->
-<!-- contributions for the j2ee.doc component -->
-<!-- ================================================= -->
-
-<plugin>
-
-<!-- ============================================================================= -->
-<!-- Define TOCs -->
-<!-- ============================================================================= -->
-
- <extension point="org.eclipse.help.toc">
- <toc file="ejb_toc.xml" />
- </extension>
-
-</plugin>
\ No newline at end of file
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 4d431e1..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/cearch.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 http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>EJB architecture</title>
-</head>
-<body id="cearch"><a name="cearch"><!-- --></a>
-
-<h1 class="topictitle1">EJB architecture</h1>
-<div><p>This topic provides a high-level overview of the distributed component
-architecture defined in the Sun Microsystems Enterprise JavaBeans™ (EJB)
-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">java.sun.com</a> Web site.</p>
-<p>Enterprise beans provide several benefits for application developers: </p>
-<ul><li>They allow you to build distributed applications by combining components
-developed using tools from different vendors. </li>
-<li>They 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>They can be developed once and then deployed on multiple platforms without
-recompilation or source code modification. </li>
-<li>The EJB specification that governs the use of enterprise beans is compatible
-with other Java™ APIs and CORBA. It also provides for interoperability
-between enterprise beans and non-Java applications.</li>
-</ul>
-<dl><dt class="dlterm"><b>Enterprise beans</b></dt>
-<dd>An <em>enterprise bean</em> 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: <em>session
-beans</em>, <em>entity beans</em>, and <em>message-driven</em> beans.<div class="p"><blockquote> <ul><li><b>Session beans</b>: <em>Session beans</em> are non-persistent
-enterprise beans. They can be stateful or stateless. A <em>stateful session
-bean</em> 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.
-A <em>stateless session bean</em>, by comparison, does not maintain any conversational
-state. Stateless session beans are pooled by their container to handle multiple
-requests from multiple clients.</li>
-<li><b>Entity beans</b>: <em>Entity beans</em> 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 <em>bean-managed persistence (BMP)
- entity beans</em>. Entity beans that delegate their persistence to their EJB
-container are called <em>container-managed persistence (CMP) entity beans</em>.</li>
-<li><b>Message-driven beans</b>: <em>Message-driven beans</em> 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>
-</blockquote>
-</div>
-</dd>
-</dl>
-<dl><dt class="dlterm"><b>Remote client view</b></dt>
-<dd>The <em>remote client view</em> 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.<ul><li><b>Remote interface</b>: The <em>remote interface</em> specifies
-the remote business methods that a client can call on an enterprise bean.</li>
-<li><b>Remote home interface</b>: The <em>remote home interface</em> 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"><b>Local client view</b></dt>
-<dd>The <em>local client view</em> 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 bean
-that are local clients. Session and entity beans can be tightly couple with
-their clients, allowing access without the overhead typically associated with
-remote method calls.<ul><li><b>Local interface</b>: The <em>local interface</em> 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 <em>local home interface</em> specifies
-the methods used by local clients for locating, creating, and removing instances
-of enterprise bean classes.</li>
-</ul>
-</dd>
-</dl>
-<dl>
-<dt class="dlterm"><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.<ul><li><b>Service endpoint interface: </b>
-The <em>service endpoint interface</em> 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></li></ul>
-
-
-</dd>
-</dl>
-<dl><dt class="dlterm"><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 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"><b>EJB container</b></dt>
-<dd>An <em>EJB container</em> 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></dl>
-<dl>
-
-<dt class="dlterm"><b>Deployment descriptor</b></dt>
-<dd>A <em>deployment descriptor</em> 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></dl>
-<dl>
-<dt class="dlterm"><b>EJB server</b></dt>
-
-<dd>An <em>EJB server</em> 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>
-<p>
- (C) Copyright IBM Corporation 2000, 2005. All Rights Reserved.
- </p>
-</body>
-</html>
\ No newline at end of file
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 eb1713b..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/ceclientjars.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>EJB client JAR projects</title>
-</head>
-<body id="ceclientjars"><a name="ceclientjars"><!-- --></a>
-
-<h1 class="topictitle1">EJB 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 J2EE
-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"><b>Note: </b>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"><b>Important: </b>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>
-<p>
- (C) Copyright IBM Corporation 2000, 2005. All Rights Reserved.
- </p>
-</body>
-</html>
\ No newline at end of file
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 38c0627..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/ceover.html
+++ /dev/null
@@ -1,64 +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>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>EJB application development</title>
-</head>
-<body id="ceover"><a name="ceover"><!-- --></a>
-
-<h1 class="topictitle1">EJB 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)
-specification. This product supports the Enterprise JavaBeans 1.1,
-2.0, and 2.1 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">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">EJB architecture</a> for a brief description
-of key EJB concepts.</p>
-<p>The EJB development environment includes the following tools:</p>
-<ul><li>The J2EE perspective</li>
-<li>Tools for importing existing EJB JAR files</li>
-<li>Tools for exporting existing EJB projects into JAR files</li>
-<li>Tools for creating session and message-driven enterprise beans</li>
-<li>Tools for validating your enterprise beans for specification compliance</li>
-</ul>
-<dl><dt class="dlterm"><b>J2EE perspective</b></dt>
-<dd>All of the EJB tools are accessible from the J2EE perspective. This perspective
-provides a layout in which the most commonly used actions, views, and wizards
-for J2EE and EJB development are easily accessible</dd>
-</dl>
-<dl>
-<dt class="dlterm"><b>Creating enterprise beans</b></dt>
-<dd>The EJB tools help you create enterprise beans, such as session beans or message-driven beans. <p>You can also
-accomplish complementary enterprise bean development activities, such as writing
-and editing business logic, importing or exporting enterprise beans, and maintaining
-both your enterprise bean source code and generated code using the built in Java development
-tools, along with the team and version control capabilities of the workbench.</p>
- </dd>
-<dt class="dlterm"><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 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>
-</dl>
-</div>
-<p>
- (C) Copyright IBM Corporation 2000, 2005. All Rights Reserved.
- </p>
-</body>
-</html>
\ No newline at end of file
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 3d5f93d..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/ceresrc.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>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>EJB development resources</title>
-</head>
-<body id="ceresrc"><a name="ceresrc"><!-- --></a>
-
-<h1 class="topictitle1">EJB development resources</h1>
-<div><p>This topic describes resources and development tools that are commonly
-used in EJB development.</p>
-<dl><dt class="dlterm"><b>EJB modules</b></dt>
-<dd> <p>EJB modules are displayed in the Project Explorer view of the J2EE
-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 be exported as either
-a standalone EJB JAR file, or it can be 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 META-INF 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"><b>Note: </b>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></dl>
-<dl>
-<dt class="dlterm"><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 Java project. By default, the source and the output
-files of the project are located in the <b>ejbModule</b> folder.
-As you make changes and generate deployment code, the Java classes
-are compiled into the same (<b>ejbModule</b>, by default) folder. You cannot
-use the EJB project as the source folder; doing so will cause errors.</p>
-<div class="note"><b>Note: </b>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 <b>Other Projects</b> node.</div>
-</dd></dl>
-<dl>
-<dt class="dlterm"><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 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"><b>Tip: </b>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></dl>
-<dl>
-<dt class="dlterm"><b>Enterprise beans</b></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>
-<dl>
-<dl><dt class="dlterm"><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>
-<dt class="dlterm"><b>Session beans</b></dt>
-<dd>Session beans do not <em>require</em> 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></dl>
-<dl>
-<dt class="dlterm"><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>
-</dl>
-</dl>
-<dl>
-</dd>
-<dt class="dlterm"><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 Java 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>
-</dl>
-</div>
-<p>
- (C) Copyright IBM Corporation 2000, 2005. All Rights Reserved.
- </p>
-</body>
-</html>
\ No newline at end of file
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 e6aa57d..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/tecrte.html
+++ /dev/null
@@ -1,46 +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>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Creating 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 the Create Enterprise JavaBean wizard to create session beans and message-driven
-beans that support XDoclet annotation.</p>
-<div class="p">Before you can create an enterprise bean, you must:<ul><li>Define an EJB project to contain the enterprise bean. See <a href="tecrtpro.html">Creating EJB projects</a>.</li>
-<li>Install XDoclet annotation support and enable it. See <a href="txdocletconf.html">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 two types of enterprise beans: session beans and
-message-driven beans (EJB 2.0 or later projects only).</p>
-</div>
-</div>
-<p>
- (C) Copyright IBM Corporation 2000, 2005. All Rights Reserved.
- </p>
-</body>
-</html>
\ No newline at end of file
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 9571296..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/tecrtpro.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Creating 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 J2EE 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:</p>
-</div>
-<ol>
- <li class="stepexpand"><span>In the J2EE perspective, select <b>File</b> > <b>New</b> > <b>Other</b> > <b>EJB</b> > <b>EJB Project</b></span>. The New EJB Project wizard
-opens.</li>
-<li class="stepexpand"><span>In the <b>Project Name</b> field, type a name for the EJB
-project.</span></li>
-<li class="stepexpand"><span><b>Optional: </b>To use a different workspace directory for your EJB project, modify the settings for <b>Project contents</b>.</span>
-<br/><b>Important: </b>If you specify a non-default project location that is already being used
-by another project, the project creation will fail.</li>
-
-<li class="stepexpand"><span>In the <b>Target runtime</b> 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 <b>New</b> button if a target runtime
-does not exist, or if you want to use a different one.</span></li>
-<li class="stepexpand"><strong>Optional: </strong><span>Select the <b>Add project to an EAR</b> 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 <b>EAR Project Name</b> combination
-box. Or, click the <b>New</b> button to launch the New Enterprise
-Application Project wizard.
-</li>
-<li class="stepexpand">Click <b>Next</b>.</li>
-<li class="stepexpand">Select the appropriate <b>Project Facets</b> for your EJB project. A project facet is a
- set of internal functions that add support for a given technology.</li>
-<li class="stepexpand">Click <b>Next</b>.</li>
-<li class="stepexpand"><b>Optional: </b>Change the value of <b>Source Folder</b> to change the directory where the Java source files are stored.
-</li>
-<li class="stepexpand"><strong>Optional: </strong><span>Select the <b>Create an EJB Client
-JAR Project to hold the client interfaces and classes</b> 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 <b>Name</b> of the EJB Client JAR project, or the name (<b>Client JAR URI</b>)
-of the client JAR file.</span></li>
-<li class="stepexpand"><span>Click <b>Finish</b>.</span></li>
-</ol>
-</div>
-<p>
- (C) Copyright IBM Corporation 2000, 2005. All Rights Reserved.
- </p>
-</body>
-</html>
\ No newline at end of file
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 9d0d956..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/teexp.html
+++ /dev/null
@@ -1,62 +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>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Exporting EJB projects to EJB JAR files</title>
-</head>
-<body id="teexp"><a name="teexp"><!-- --></a>
-
-<h1 class="topictitle1">Exporting EJB projects to EJB JAR files</h1>
-<div><p>After you have tested your enterprise beans, you can export the
-project 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><b>Important: </b>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:</p>
-</div>
-<ol><li class="stepexpand"><span>In the Project Explorer view of the J2EE perspective, right-click
-the EJB project that you want to export.</span></li>
-<li class="stepexpand"><span>Select <b>Export</b> > <b>EJB
-JAR file</b> from the pop-up menu. The Export wizard
-opens.</span> </li>
-<li class="stepexpand"><span>Select the <b>EJB project</b> to export from the drop-down list.</span></li>
-<li class="stepexpand"><span>In the <b>Destination</b> field, provide the full
-path and JAR file name for the exported EJB module.</span></li>
-<li class="stepexpand"><strong>Optional: </strong><span>To include source files in the exported JAR
-file, select the <b>Export source files</b> check box.</span></li>
-<li class="stepexpand"><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 <b>Overwrite
-existing file</b>.</span></li>
-<li class="stepexpand"><span>Click <b>Finish</b>.</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>
-<p>
- (C) Copyright IBM Corporation 2000, 2005. All Rights Reserved.
- </p>
-</body>
-</html>
\ No newline at end of file
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 3d93a34..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/teimp.html
+++ /dev/null
@@ -1,74 +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>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Importing EJB JAR files</title>
-</head>
-<body id="teimp"><a name="teimp"><!-- --></a>
-
-<h1 class="topictitle1">Importing EJB 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="p">
- <p>To import an EJB
-JAR file into an EJB project using the Import wizard:</p>
-<ol><li class="stepexpand"><span>In the J2EE perspective, click <b>File</b> > <b>Import</b> > <b>EJB JAR file</b></span> and
-click <b>Next</b>.</li>
-<li class="stepexpand"><span>In the <b>EJB JAR file</b> combination box, enter
-the location and name of the EJB JAR file that you want to import. You can
-click the <b>Browse</b> button to select the JAR file from
-the file system.</span></li>
-<li class="stepexpand"><span>In the <b>EJB Project</b> combination box, type
-a new project name or select an EJB project from the drop-down list. </span></li>
-<li class="stepexpand"><span>In the <b>Target runtime</b> drop-down list, select
-the application server that you want to target for your development. If no
-target servers exist, create one using the <b>New</b> button.</span> The target server choice affects the run time settings by modifying
-the class path entries for the project.</li>
-<li class="stepexpand"><span>Specify whether you want to add the new module to an enterprise
-application (EAR) project.</span></li>
-<li class="stepexpand"><span>In the <b>EAR application</b> combination box,
-type a new project name or select an existing enterprise application project
-from the drop-down list. Or, click the <b>New</b> button to
-launch the New EAR Application Project wizard.</span> <div class="note"><b>Note: </b>If
-you type a new EAR project name, the EAR project will be created in the default
-location with the lowest compatible J2EE version based on the version of the
-project being created. If you want to specify a different version or a different
-location for the enterprise application, you must use the New Enterprise Application
-Project wizard.</div>
-</li>
-<li class="stepexpand"><span>Click <b>Finish</b> to import the
-EJB JAR file.</span></li>
-</ol>
-<div class="tip"><p><b>Tip: </b>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.</p></div>
-<div class="tip"><p><b>Tip: </b><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 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.</p></div>
-
-</div>
-<div class="section"><div class="note"><p><b>Note: </b>The .ser files in an EJB 1.0 JAR are converted into the ejb-jar.xml
-file for EJB 1.1 during an import.</p></div>
-</div>
-</div>
-<p>
- (C) Copyright IBM Corporation 2000, 2005. All Rights Reserved.
- </p>
-</body>
-</html>
\ No newline at end of file
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 14f3700..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/temessb.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>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Creating 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">Before you can create an enterprise bean, you must:<ul><li>Define an EJB project to contain the enterprise bean. See <a href="tecrtpro.html">Creating EJB projects</a>.</li>
-<li>Install XDoclet annotation support and enable it. See <a href="txdocletconf.html">Configuring XDoclet annotation support</a>.</li>
-</ul>
-</div>
-<div class="section"><p>To create a message-driven bean:</p>
-</div>
-<ol><li class="stepexpand"><span>In the
- J2EE perspective, click <b>File</b> > <b>New</b> > <b>Other</b> > <b>EJB</b> > <b>XDoclet Enterprise JavaBean</b></span>.
- The Create Enterprise JavaBean wizard appears.</li>
-<li class="stepexpand"><span>Select the <b>MessageDrivenBean</b> radio button.</span></li>
-<li class="stepexpand"><span>Click <b>Next</b>.</span></li>
-<li class="stepexpand"><span>Select the <b>Project</b> that will contain the
-new bean.</span></li>
-
-<li class="stepexpand"><span>In the <b>Folder</b> field, select the folder for
-the new bean.</span></li>
-<li class="stepexpand"><span>In the <b>Java package</b> field, enter the package
-name for the new bean.</span></li>
-<li class="stepexpand"><span>In the <strong>Class name</strong> field, type a name for the enterprise
-bean. By convention, bean names should begin with an uppercase letter.</span> <div class="note"><b>Note: </b>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 <b>Superclass</b> for the bean if you
-want it to inherit from a class other than <samp class="codeph">java.lang.Object</samp>.</span></li>
-
-<li class="stepexpand"><span>Click <b>Next</b>.</span></li>
-<li class="stepexpand"><span>Provide an <b>EJB Name</b> for the bean.</span> This is the name of the enterprise bean class.</li>
-<li class="stepexpand"><span>Provide an <b>Destination JNDI Name</b> for the bean.</span> This is a logical name used by the server to locate an enterprise bean
-at runtime.</li>
-<li class="stepexpand"><span>Provide an <b>Display Name</b> for the bean.</span> This is a short name for the enterprise bean that is used by tools.</li>
-<li class="stepexpand"><span>Provide a text <b>Description</b> for the bean.</span></li>
-<li class="stepexpand"><span>Select a <b>Destination</b> for the new bean: </span><ul><li><b>Queue</b> specifies that the point-to-point JMS messaging model will be used.</li>
- <li><b>Topic</b> specifies that the publish-and-subscribe JMS messaging model will be used.</li></ul></li>
-<li class="stepexpand"><span>Select a <b>Transaction Type</b> for the new bean:</span><ul><li><b>Container</b> specifies that the transaction demarcation
-is performed by the container.</li>
-<li><b>Bean</b> specifies that the transaction demarcation
-is performed by the bean.</li>
-</ul>
-</li>
-<li class="stepexpand"><span>Click <b>Next</b>.</span></li>
-<li class="stepexpand"><span>Select the type of <b>Modifiers</b> to use for
-the class. Choices are <b>Public</b>, <b>Abstract</b>,
-and <b>Final</b>.</span></li>
-<li class="stepexpand"><span>Select the <b>Interfaces</b> you want the bean
-to implement:</span><ul><li>Click the <b>Add</b> button to open the Type Selection
-dialog box where you can select the interface that you want to implement.</li>
-<li>If you added an interface that you no longer want to implement, select
-the interface in the list and click <strong>Remove</strong>.</li>
-</ul>
-</li>
-<li class="stepexpand"><span>Select the method stubs that you want the wizard to create. Choices
-include <b>main</b>, <b>Inherited abstract methods</b>,
-and <b>Constructors from the superclass</b>.</span></li>
-<li class="stepexpand"><span>Click <b>Finish</b>.</span> The new bean
-is added to the specified EJB project.</li>
-</ol>
-</div>
-<p>
- (C) Copyright IBM Corporation 2000, 2005. All Rights Reserved.
- </p>
-</body>
-</html>
\ No newline at end of file
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 61a5952..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/tesessb.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Creating 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">Before you can create an enterprise bean, you must:<ul><li>Define an EJB project to contain the enterprise bean. See <a href="tecrtpro.html">Creating EJB projects</a>.</li>
-<li>Install XDoclet annotation support and enable it. See <a href="txdocletconf.html">Configuring XDoclet annotation support</a>.</li>
-</ul>
-</div>
-<div class="section"> <p>To create a session bean:</p>
-</div>
-<ol><li class="stepexpand"><span>In the J2EE perspective, click <b>File</b> > <b>New</b> > <b>Other</b> > <b>EJB</b> > <b>XDoclet Enterprise JavaBean</b>. The Create an Enterprise
-Bean wizard appears.</span></li>
-<li class="stepexpand"><span>Select the <b>SessionBean</b> radio button.</span></li>
-<li class="stepexpand"><span>Click <b>Next</b>.</span></li>
-<li class="stepexpand"><span>Select the <b>Project</b> that will contain the
-new session bean.</span></li>
-
-<li class="stepexpand"><span>In the <b>Folder</b> field, select the folder for
-the new bean.</span></li>
-<li class="stepexpand"><span>In the <b>Java package</b> field, enter the package
-name for the new bean.</span></li>
-<li class="stepexpand"><span>In the <strong>Class name</strong> field, type a name for the enterprise
-bean. By convention, bean names should begin with an uppercase letter.</span> <div class="note"><b>Note: </b>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 <b>Superclass</b> for the bean if you
-want it to inherit from a class other than <samp class="codeph">java.lang.Object</samp>.</span></li>
-
-
-<li class="stepexpand"><span>Click <b>Next</b>.</span></li>
-<li class="stepexpand"><span>Provide an <b>EJB Name</b> for the bean.</span> This is the name of the enterprise bean class.</li>
-<li class="stepexpand"><span>Provide an <b>JNDI Name</b> for the bean.</span> This is a logical name used by the server to locate an enterprise bean
-at runtime.</li>
-<li class="stepexpand"><span>Provide an <b>Display Name</b> for the bean.</span> This is a short name for the enterprise bean that is used by tools.</li>
-<li class="stepexpand"><span>Provide a text <b>Description</b> for the bean.</span></li>
-<li class="stepexpand"><span>Select the <b>State type</b> for the new bean:</span><ul><li>A <b>Stateful</b> 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 <b>Stateless</b> 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 <b>Transaction Type</b> for the new bean:</span><ul><li><b>Container</b> specifies that the transaction demarcation
-is performed by the container.</li>
-<li><b>Bean</b> specifies that the transaction demarcation
-is performed by the bean.</li>
-</ul>
-</li>
-<li class="stepexpand"><span>Click <b>Next</b>.</span></li>
-<li class="stepexpand"><span>Select the type of <b>Modifiers</b> to use for
-the class. Choices are <b>Public</b>, <b>Abstract</b>,
-and <b>Final</b>.</span></li>
-<li class="stepexpand"><span>Select the <b>Interfaces</b> you want the bean
-to implement:</span><ul><li>Click the <b>Add</b> button to open the Type Selection
-dialog box where you can select the interface that you want to implement.</li>
-<li>If you added an interface that you no longer want to implement, select
-the interface in the list and click <strong>Remove</strong>.</li>
-</ul>
-</li>
-<li class="stepexpand"><span>Select the method stubs that you want the wizard to create. Choices
-include <b>main</b>, <b>Inherited abstract methods</b>,
-and <b>Constructors from the superclass</b>.</span></li>
-<li class="stepexpand"><span>Click <b>Finish</b>.</span> The new bean
-is added to the specified EJB project.</li>
-</ol>
-</div>
-<p>
- (C) Copyright IBM Corporation 2000, 2005. All Rights Reserved.
- </p>
-</body>
-</html>
\ No newline at end of file
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 874c199..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/txdocletconf.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>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">Download and install XDoclet from <a href="http://xdoclet.sourceforge.net/xdoclet/index.html" target="_blank">http://xdoclet.sourceforge.net/xdoclet/index.html</a></div>
-<div class="p"><p>To configure XDoclet to work with the workbench:</div>
-<ol><li class="stepexpand"><span>Click <b>Window</b> > <b>Preferences</b> > <b>XDoclet</b></span> to
-open the XDoclet Runtime Preferences page.</li>
-<li class="stepexpand"><span>Check the <b>Enable XDoclet Builder</b> check box
- to turn on annotation-based artifact creation.</span></li>
- <li class="stepexpand"><span>Use the <b>Browse</b> button to locate the installation directory for
-XDoclet (<strong>XDoclet Home</strong>). </span></li>
-<li class="stepexpand"><span>Select the <b>Version</b> of XDoclet that you have
-installed. </span> Supported versions include 1.2.1, 1.2.2, 1.2.3.</li>
-
-<li class="stepexpand"><span> Click <strong>OK</strong> to save the preferences.</span></li>
-</ol>
-</div>
-<p>
- (C) Copyright IBM Corporation 2000, 2005. All Rights Reserved.
- </p>
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.ejb.ui/.classpath b/plugins/org.eclipse.jst.ejb.ui/.classpath
deleted file mode 100644
index f53a58f..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="ejb_ui"/>
- <classpathentry kind="src" path="property_files"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.ejb.ui/.cvsignore b/plugins/org.eclipse.jst.ejb.ui/.cvsignore
deleted file mode 100644
index 1ec2f6e..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-temp.folder
-build.xml
-ejb_ui.jar
-@dot
-src.zip
diff --git a/plugins/org.eclipse.jst.ejb.ui/.project b/plugins/org.eclipse.jst.ejb.ui/.project
deleted file mode 100644
index ac932ae..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ejb.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>com.ibm.etools.ctc.javaprojectnature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.ejb.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.ejb.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 583fb08..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,37 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: WTP EJB UI Plug-in
-Bundle-SymbolicName: org.eclipse.jst.ejb.ui; singleton:=true
-Bundle-Version: 1.0.0
-Bundle-Activator: org.eclipse.jst.ejb.ui.internal.plugin.EJBUIPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ejb.ui.internal.actions,
- org.eclipse.jst.ejb.ui.internal.deployables,
- org.eclipse.jst.ejb.ui.internal.plugin,
- org.eclipse.jst.ejb.ui.internal.util,
- org.eclipse.jst.ejb.ui.internal.wizard,
- org.eclipse.jst.ejb.ui.project.facet
-Require-Bundle: org.eclipse.core.resources,
- org.eclipse.ui,
- org.eclipse.wst.common.frameworks.ui,
- org.eclipse.jst.j2ee.ejb,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.core,
- org.eclipse.ui.workbench,
- org.eclipse.core.runtime,
- org.eclipse.wst.common.frameworks,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.jst.j2ee.ui;visibility:=reexport,
- org.eclipse.jst.common.annotations.controller,
- org.eclipse.wst.common.navigator.workbench,
- org.eclipse.wst.common.modulecore,
- org.eclipse.jem.util,
- org.eclipse.debug.ui,
- org.eclipse.jdt.core,
- org.eclipse.wst.server.core,
- org.eclipse.jst.common.frameworks,
- org.eclipse.wst.common.project.facet.ui,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.wst.web.ui
-Eclipse-AutoStart: true
diff --git a/plugins/org.eclipse.jst.ejb.ui/about.html b/plugins/org.eclipse.jst.ejb.ui/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.ejb.ui/build.properties b/plugins/org.eclipse.jst.ejb.ui/build.properties
deleted file mode 100644
index f0cfc7b..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-bin.includes = plugin.xml,\
- icons/,\
- plugin.properties,\
- plugin_de.properties,\
- plugin_es.properties,\
- plugin_fr.properties,\
- plugin_it.properties,\
- plugin_ja.properties,\
- plugin_ko.properties,\
- plugin_pt_BR.properties,\
- plugin_zh_CN.properties,\
- plugin_zh_TW.properties,\
- .,\
- META-INF/,\
- about.html
-src.includes = plugin.xml,\
- plugin.properties
-
-source.. = ejb_ui/,\
- property_files/
-output.. = bin/
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/actions/EJBArchiveUIResourceHandler.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/actions/EJBArchiveUIResourceHandler.java
deleted file mode 100644
index bf26923..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/actions/EJBArchiveUIResourceHandler.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.ejb.ui.internal.actions;
-
-
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class EJBArchiveUIResourceHandler {
-
- private static ResourceBundle fgResourceBundle;
-
- /**
- * Returns the resource bundle used by all classes in this Project
- */
- public static ResourceBundle getResourceBundle() {
- try {
- return ResourceBundle.getBundle("ejbarchiveui");//$NON-NLS-1$
- } catch (MissingResourceException e) {
- // does nothing - this method will return null and
- // getString(String, String) will return the key
- // it was called with
- }
- return null;
- }
-
- public static String getString(String key) {
- if (fgResourceBundle == null) {
- fgResourceBundle = getResourceBundle();
- }
-
- if (fgResourceBundle != null) {
- try {
- return fgResourceBundle.getString(key);
- } catch (MissingResourceException e) {
- return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
- }
- }
- return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
- }
-
- public static String getString(String key, Object[] args) {
-
- try {
- return MessageFormat.format(getString(key), args);
- } catch (IllegalArgumentException e) {
- return getString(key);
- }
-
- }
-
- public static String getString(String key, Object[] args, int x) {
-
- return getString(key);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/actions/EJBCheckboxTableViewer.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/actions/EJBCheckboxTableViewer.java
deleted file mode 100644
index aea382a..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/actions/EJBCheckboxTableViewer.java
+++ /dev/null
@@ -1,128 +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.ejb.ui.internal.actions;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Widget;
-
-/**
- * Insert the type's description here. Creation date: (3/22/2001 4:44:53 PM)
- *
- * @author: Administrator
- */
-public class EJBCheckboxTableViewer extends org.eclipse.jface.viewers.CheckboxTableViewer {
- /**
- * EJBCheckboxTableViewer constructor comment.
- *
- * @param parent
- * org.eclipse.swt.widgets.Composite
- * @param style
- * int
- */
- public EJBCheckboxTableViewer(org.eclipse.swt.widgets.Composite parent, int style) {
- super(createTable(parent, style));
- }
-
- /**
- * EJBCheckboxTableViewer constructor comment.
- *
- * @param table
- * org.eclipse.swt.widgets.Table
- */
- public EJBCheckboxTableViewer(org.eclipse.swt.widgets.Table table) {
- super(table);
- }
-
- /**
- * Returns a list of elements corresponding to checked table items in this viewer.
- * <p>
- * This method is typically used when preserving the interesting state of a viewer;
- * <code>setCheckedElements</code> is used during the restore.
- * </p>
- * <p>
- * [Issue: Should return Object[] rather than List.]
- * </p>
- *
- * @return the list of checked nodes (element type: <code>Object</code>)
- * @see #setCheckedElements
- */
- public List getAllElements() {
- TableItem[] children = getTable().getItems();
- List v = new ArrayList(children.length);
- for (int i = 0; i < children.length; i++) {
- TableItem item = children[i];
- v.add(item.getData());
- }
-
- return v;
- }
-
- /**
- * Returns a list of elements corresponding to checked table items in this viewer.
- * <p>
- * This method is typically used when preserving the interesting state of a viewer;
- * <code>setCheckedElements</code> is used during the restore.
- * </p>
- * <p>
- * [Issue: Should return Object[] rather than List.]
- * </p>
- *
- * @return the list of checked nodes (element type: <code>Object</code>)
- * @see #setCheckedElements
- */
- public List getUnCheckedElements() {
- TableItem[] children = getTable().getItems();
- List v = new ArrayList(children.length);
- for (int i = 0; i < children.length; i++) {
- TableItem item = children[i];
- if (!(item.getChecked()))
- v.add(item.getData());
- }
- return v;
- }
-
- /**
- * Sets which nodes are checked in this viewer. The given list contains the elements that are to
- * be checked; all other nodes are to be unchecked.
- * <p>
- * This method is typically used when restoring the interesting state of a viewer captured by an
- * earlier call to <code>getCheckedElements</code>.
- * </p>
- * <p>
- * [Issue: Should accept Object[] rather than List.]
- * </p>
- *
- * @param elements
- * the list of checked elements (element type: <code>Object</code>)
- * @see #getCheckedElements
- */
- public void setUnCheckedElements(List elements) {
- for (int i = 0; i < elements.size(); i++) {
- Widget widget = findItem(elements.get(i));
- if (widget instanceof TableItem)
- ((TableItem) widget).setChecked(false);
- }
-
- }
-
- public void setCheckedElements(List elements) {
- for (int i = 0; i < elements.size(); i++) {
- Widget widget = findItem(elements.get(i));
- if (widget instanceof TableItem)
- ((TableItem) widget).setChecked(true);
- }
-
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/actions/EJBSelectiveImportDialog.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/actions/EJBSelectiveImportDialog.java
deleted file mode 100644
index 8e37b13..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/actions/EJBSelectiveImportDialog.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ejb.ui.internal.actions;
-
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Insert the type's description here. Creation date: (9/7/2001 11:28:24 AM)
- *
- * @author: Administrator
- */
-public class EJBSelectiveImportDialog extends org.eclipse.jface.dialogs.MessageDialog {
- protected String[] ejbList;
-
- /**
- * EJBSelectiveImportDialog constructor comment.
- *
- * @param parentShell
- * org.eclipse.swt.widgets.Shell
- * @param dialogTitle
- * java.lang.String
- * @param dialogTitleImage
- * org.eclipse.swt.graphics.Image
- * @param dialogMessage
- * java.lang.String
- * @param dialogImageType
- * int
- * @param dialogButtonLabels
- * java.lang.String[]
- * @param defaultIndex
- * int
- */
- public EJBSelectiveImportDialog(org.eclipse.swt.widgets.Shell parentShell, String dialogTitle, org.eclipse.swt.graphics.Image dialogTitleImage, String dialogMessage, int dialogImageType, java.lang.String[] dialogButtonLabels, int defaultIndex) {
- super(parentShell, dialogTitle, dialogTitleImage, dialogMessage, dialogImageType, dialogButtonLabels, defaultIndex);
- }
-
- /**
- * EJBSelectiveImportDialog constructor comment.
- *
- * @param parentShell
- * org.eclipse.swt.widgets.Shell
- * @param dialogTitle
- * java.lang.String
- * @param dialogTitleImage
- * org.eclipse.swt.graphics.Image
- * @param dialogMessage
- * java.lang.String
- * @param dialogImageType
- * int
- * @param dialogButtonLabels
- * java.lang.String[]
- * @param defaultIndex
- * int
- */
- public EJBSelectiveImportDialog(org.eclipse.swt.widgets.Shell parentShell, String dialogTitle, org.eclipse.swt.graphics.Image dialogTitleImage, String dialogMessage, int dialogImageType, java.lang.String[] dialogButtonLabels, int defaultIndex, String[] ejbNames) {
- super(parentShell, dialogTitle, dialogTitleImage, dialogMessage, dialogImageType, dialogButtonLabels, defaultIndex);
- ejbList = ejbNames;
- }
-
- /**
- * Creates and returns the contents of an area of the dialog which appears below the message and
- * above the button bar.
- * <p>
- * The default implementation of this framework method returns <code>null</code>. Subclasses
- * may override.
- * </p>
- *
- * @param the
- * parent composite to contain the custom area
- * @return the custom area control, or <code>null</code>
- */
- protected Control createCustomArea(Composite parent) {
-
- Composite composite = new Composite(parent, 0);
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
- layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
- layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- if (ejbList != null) {
- List list = new List(composite, SWT.BORDER | SWT.HIDE_SELECTION);
- GridData data = new GridData(GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_CENTER);
- list.setLayoutData(data);
- list.setItems(ejbList);
- list.setForeground(new Color(null, 0, 0, 255));
- }
-
- return composite;
-
- }
-
- /**
- * Convenience method to open a simple Yes/No question dialog.
- *
- * @param parent
- * the parent shell of the dialog, or <code>null</code> if none
- * @param title
- * the dialog's title, or <code>null</code> if none
- * @param message
- * the message
- * @return <code>true</code> if the user presses the OK button, <code>false</code> otherwise
- */
- public static boolean openError(Shell parent, String title, String message, String[] names) {
- EJBSelectiveImportDialog dialog = new EJBSelectiveImportDialog(parent, title, null, // accept
- // the
- // default
- // window
- // icon
- message, ERROR, new String[]{IDialogConstants.OK_LABEL}, 0, names); // yes is
- // the
- // default
- return dialog.open() == 0;
- }
-
- /**
- * Convenience method to open a simple Yes/No question dialog.
- *
- * @param parent
- * the parent shell of the dialog, or <code>null</code> if none
- * @param title
- * the dialog's title, or <code>null</code> if none
- * @param message
- * the message
- * @return <code>true</code> if the user presses the OK button, <code>false</code> otherwise
- */
- public static boolean openQuestion(Shell parent, String title, String message, String[] ejbNames) {
- EJBSelectiveImportDialog dialog = new EJBSelectiveImportDialog(parent, title, null, // accept
- // the
- // default
- // window
- // icon
- message, QUESTION, new String[]{IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL}, 0, ejbNames); // yes
- // is
- // the
- // default
- return dialog.open() == 0;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/actions/ExportEJBAction.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/actions/ExportEJBAction.java
deleted file mode 100644
index 9784278..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/actions/ExportEJBAction.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 27, 2003
- *
- * To change this generated comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.ejb.ui.internal.actions;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.ejb.ui.internal.wizard.EJBComponentExportWizard;
-import org.eclipse.jst.j2ee.internal.actions.BaseAction;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * @author jsholl
- *
- * To change this generated comment go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class ExportEJBAction extends BaseAction {
- public static String LABEL = Platform.getResourceString(J2EEUIPlugin.getDefault().getBundle(), "%ejb.export.action.description_ui_"); //$NON-NLS-1$
- private static final String ICON = "export_ejbjar_wiz"; //$NON-NLS-1$
-
- public ExportEJBAction() {
- super();
- setText(LABEL);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.common.actions.BaseAction#primRun(org.eclipse.swt.widgets.Shell)
- */
- protected void primRun(Shell shell) {
- EJBComponentExportWizard wizard = new EJBComponentExportWizard();
- J2EEUIPlugin plugin = J2EEUIPlugin.getDefault();
- wizard.init(plugin.getWorkbench(), selection);
-
- WizardDialog dialog = new WizardDialog(shell, wizard);
- dialog.create();
- dialog.open();
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/actions/ImportEJBAction.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/actions/ImportEJBAction.java
deleted file mode 100644
index 0c4e5ff..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/actions/ImportEJBAction.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 27, 2003
- *
- * To change this generated comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-package org.eclipse.jst.ejb.ui.internal.actions;
-
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.ejb.ui.internal.wizard.EJBComponentImportWizard;
-import org.eclipse.jst.j2ee.internal.actions.BaseAction;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * @author jsholl
- *
- * To change this generated comment go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class ImportEJBAction extends BaseAction {
- public static String LABEL = EJBArchiveUIResourceHandler.getString("Import_EJBJar"); //$NON-NLS-1$
- private static final String ICON = "import_ejbjar_wiz"; //$NON-NLS-1$
-
- public ImportEJBAction() {
- super();
- setText(LABEL);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.common.actions.BaseAction#primRun(org.eclipse.swt.widgets.Shell)
- */
- protected void primRun(Shell shell) {
-
- EJBComponentImportWizard wizard = new EJBComponentImportWizard();
-
- J2EEUIPlugin plugin = J2EEUIPlugin.getDefault();
-
- wizard.init(plugin.getWorkbench(), StructuredSelection.EMPTY);
-
- WizardDialog dialog = new WizardDialog(shell, wizard);
- dialog.create();
- dialog.open();
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/actions/NewEJBComponentAction.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/actions/NewEJBComponentAction.java
deleted file mode 100644
index 3e21568..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/actions/NewEJBComponentAction.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.ejb.ui.internal.actions;
-
-
-
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jst.ejb.ui.internal.util.EJBUIMessages;
-import org.eclipse.jst.ejb.ui.project.facet.EjbProjectWizard;
-import org.eclipse.jst.j2ee.internal.actions.AbstractOpenWizardWorkbenchAction;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.ui.IWorkbench;
-
-
-
-
-public class NewEJBComponentAction extends AbstractOpenWizardWorkbenchAction {
-
- // TODO MDE 02-28 Find correct label
- public static String LABEL = EJBUIMessages.NewEJBModuleAction_UI_0;
- private static final String ICON = "newejbprj_wiz"; //$NON-NLS-1$
-
- public NewEJBComponentAction() {
- setText(LABEL);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
- }
-
- public NewEJBComponentAction(IWorkbench workbench, String label, Class[] acceptedTypes) {
- super(workbench, label, acceptedTypes, false);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
- }
-
- protected Wizard createWizard() {
- return new EjbProjectWizard();
- }
-
- protected boolean shouldAcceptElement(Object obj) {
- return true; /* NewGroup.isOnBuildPath(obj) && !NewGroup.isInArchive(obj); */
- }
-
- protected String getDialogText() {
- return null;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/deployables/EJBDeployableArtifactAdapterFactory.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/deployables/EJBDeployableArtifactAdapterFactory.java
deleted file mode 100644
index 5ba2da0..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/deployables/EJBDeployableArtifactAdapterFactory.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-
-/*
- * Created on Jan 18, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.ejb.ui.internal.deployables;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.debug.ui.actions.ILaunchable;
-import org.eclipse.jst.j2ee.ejb.internal.deployables.EJBDeployableArtifactAdapterUtil;
-import org.eclipse.wst.server.core.IModuleArtifact;
-import org.eclipse.wst.server.core.model.ModuleArtifactAdapterDelegate;
-
-public class EJBDeployableArtifactAdapterFactory extends ModuleArtifactAdapterDelegate implements IAdapterFactory {
-
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- return null;
- }
-
- public Class[] getAdapterList() {
- return new Class[]{ILaunchable.class};
- }
-
- public IModuleArtifact getModuleArtifact(Object obj) {
- return EJBDeployableArtifactAdapterUtil.getModuleObject(obj);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/plugin/EJBUIPlugin.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/plugin/EJBUIPlugin.java
deleted file mode 100644
index db7bbdf..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/plugin/EJBUIPlugin.java
+++ /dev/null
@@ -1,57 +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
- **************************************************************************************************/
-
-/*
- * Created on Nov 15, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.ejb.ui.internal.plugin;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * @author jlanuti
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class EJBUIPlugin extends AbstractUIPlugin {
-
- public static final String PLUGIN_ID = "org.eclipse.jst.ejb.ui"; //$NON-NLS-1$
-
- // The shared instance.
- private static EJBUIPlugin plugin;
-
- /**
- * The constructor.
- */
- public EJBUIPlugin() {
- super();
- plugin = this;
- }
-
-
- /**
- * Returns the shared instance.
- */
- public static EJBUIPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the workspace instance.
- */
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-}
diff --git a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/util/EJBUIMessages.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/util/EJBUIMessages.java
deleted file mode 100644
index 2f4a5aa..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/util/EJBUIMessages.java
+++ /dev/null
@@ -1,93 +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.ejb.ui.internal.util;
-
-import org.eclipse.osgi.util.NLS;
-
-
-public class EJBUIMessages extends NLS {
-
- private static final String BUNDLE_NAME = "ejb_ui";//$NON-NLS-1$
-
- private EJBUIMessages() {
- // Do not instantiate
- }
-
- public static String KEY_0;
- public static String KEY_1;
- public static String KEY_2;
- public static String KEY_3;
- public static String KEY_4;
- public static String KEY_5;
- public static String KEY_6;
- public static String KEY_7;
- public static String KEY_8;
- public static String KEY_9;
- public static String KEY_10;
- public static String KEY_11;
- public static String KEY_12;
- public static String KEY_13;
- public static String KEY_14;
- public static String KEY_15;
- public static String KEY_16;
- public static String KEY_17;
- public static String KEY_18;
- public static String KEY_19;
- public static String KEY_20;
- public static String KEY_21;
- public static String KEY_22;
- public static String KEY_23;
- public static String KEY_24;
- public static String KEY_25;
- public static String KEY_26;
- public static String KEY_27;
- public static String KEY_28;
- public static String GroupedEJBJarItemProvider_UI_0;
- public static String GroupedEJBJarItemProvider_UI_1;
- public static String GroupedEJBJarItemProvider_UI_2;
- public static String NewEJBProjectAction_UI_0;
- public static String NewEJBModuleAction_UI_0;
- public static String pageTitle;
- public static String pageDescription;
- public static String configFolderLabel;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, EJBUIMessages.class);
- }
-
- public static final String IMAGE_LOAD_ERROR = KEY_0;
- public static final String EJB_PROJECT_WIZ_TITLE = KEY_1;
- public static final String EJB_VERSION_LBL = KEY_2;
- public static final String EJB_PROJECT_MAIN_PG_TITLE = KEY_3;
- public static final String EJB_PROJECT_MAIN_PG_DESC = KEY_4;
- public static final String EJB_IMPORT_MAIN_PG_DESC = KEY_5;
- public static final String EJB_IMPORT_MAIN_PG_TITLE = KEY_6;
- public static final String EJB_JAR_FILE_LBL = KEY_7;
- public static final String EJB_PROJECT_LBL = KEY_8;
- public static final String EJB_EXPORT_MAIN_PG_TITLE = KEY_9;
- public static final String EJB_EXPORT_MAIN_PG_DESC = KEY_10;
- public static final String EJB_Client_Title = KEY_11;
- public static final String EJB_Client_Desc = KEY_12;
- public static final String Client_JAR_URI = KEY_13;
- public static final String Project_name = KEY_14;
- public static final String Project_location = KEY_15;
- public static final String EJB_Project = KEY_16;
- public static final String DELETE_BEAN_ONLY = KEY_17;
- public static final String Delete_Bean_Classes_UI = KEY_18;
- public static final String Delete_Access_Bean = KEY_19;
- public static final String Delete_Deployed_Code = KEY_20;
- public static final String Select_All_UI = KEY_21;
- public static final String Deselect_All_UI = KEY_22;
- public static final String The_selected_Enterprise_Be = KEY_23;
- public static final String Delete = KEY_24;
- public static final String Cannot_delete_Enterprise_B = KEY_25;
- public static final String Cannot_delete_bean = KEY_26;
- public static final String Delete_Enterprise_Beans = KEY_27;
- public static final String Delete_Options_Query = KEY_27;
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/AlphaImageHelper.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/AlphaImageHelper.java
deleted file mode 100644
index 79b1454..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/AlphaImageHelper.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.ejb.ui.internal.wizard;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-
-public class AlphaImageHelper {
-
- static protected Object createAlphaImage(Class clazz, String path) {
- ImageDescriptor desc = ImageDescriptor.createFromFile(clazz, path);
- Image image = desc.createImage();
- ImageData mask = image.getImageData();
- image.dispose();
- image = new Image(null, mask.width, mask.height);
- ImageData iData = image.getImageData();
- image.dispose();
-
- for (int x = 0; x < mask.width; x++)
- for (int y = 0; y < mask.height; y++) {
- int pixel = mask.getPixel(x, y);
- int value = (255 - pixel % 256) / 2;
- iData.setPixel(x, y, 0);
- iData.setAlpha(x, y, value);
- }
- return new Image(null, iData);
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBClientComponentCreationWizard.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBClientComponentCreationWizard.java
deleted file mode 100644
index 0a0fd60..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBClientComponentCreationWizard.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.ejb.ui.internal.wizard;
-
-import org.eclipse.jst.ejb.ui.internal.util.EJBUIMessages;
-import org.eclipse.jst.j2ee.internal.ejb.archiveoperations.EjbClientProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizard;
-
-public class EJBClientComponentCreationWizard extends DataModelWizard {
- private static final String PAGE_ONE = "pageOne"; //$NON-NLS-1$
-
- /**
- * @param model
- */
- public EJBClientComponentCreationWizard(IDataModel model) {
- super(model);
- setWindowTitle(EJBUIMessages.EJB_Client_Title);
- setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.CLIENT_BANNER));
- }
-
- /**
- *
- */
- public EJBClientComponentCreationWizard() {
- super();
- // TODO Auto-generated constructor stub
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.wizard.Wizard#addPages()
- */
- public void doAddPages() {
- addPage(new EJBClientComponentCreationWizardPage(getDataModel(), PAGE_ONE));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizard#runForked()
- */
- protected boolean runForked() {
- return false;
- }
-
- protected IDataModelProvider getDefaultProvider() {
- return new EjbClientProjectCreationDataModelProvider();
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBClientComponentCreationWizardPage.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBClientComponentCreationWizardPage.java
deleted file mode 100644
index ed89cce..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBClientComponentCreationWizardPage.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.ejb.ui.internal.wizard;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.ejb.ui.internal.util.EJBUIMessages;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.ejb.archiveoperations.IEjbClientProjectCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.wizard.NewModuleGroup;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-
-public class EJBClientComponentCreationWizardPage extends DataModelWizardPage implements IEjbClientProjectCreationDataModelProperties{
- public NewModuleGroup newModuleGroup = null;
- protected EJBJar selProject = null;
- private Label selectedProjectLabel;
- private Text selectedProjectName;
- private Label clientJarURILabel;
- private Text clientJarURI;
- private WorkbenchComponent module;
- protected int indent = 0;
- protected Text moduleNameText = null;
- private static final String MODULE_NAME_UI = J2EEUIMessages.getResourceString(J2EEUIMessages.NAME_LABEL); //$NON-NLS-1$
- private static final int SIZING_TEXT_FIELD_WIDTH = 305;
-
- /**
- * @param model
- * @param pageName
- */
- public EJBClientComponentCreationWizardPage(IDataModel model, String pageName) {
- super(model, pageName);
- setTitle(EJBUIMessages.EJB_Client_Title);
- setDescription(EJBUIMessages.EJB_Client_Desc);
- }
-
- /**
- * @param model
- * @param pageName
- * @param title
- * @param titleImage
- */
- public EJBClientComponentCreationWizardPage(IDataModel model, String pageName, String title, ImageDescriptor titleImage) {
- super(model, pageName, title, titleImage);
- }
-
-
-
- protected Composite createTopLevelComposite(Composite parent) {
-
- Composite top = new Composite(parent, SWT.NONE);
- top.setLayout(new GridLayout());
- top.setData(new GridData(GridData.FILL_BOTH));
-
-
- Composite composite = new Composite(top, SWT.NONE);
- GridLayout layout = new GridLayout( 3, false );
- composite.setLayout(layout);
-
- setInfopopID(IJ2EEUIContextIds.NEW_EJB_WIZARD_P2);
-
- createProjectNameGroup(composite);
- createEJBComponentSection(composite);
- createClientJarURISection(composite);
- handleHasClientJar();
- return top;
- }
-
- private void createProjectNameGroup(Composite parent) {
- // set up project name label
- Label projectNameLabel = new Label(parent, SWT.NONE);
- projectNameLabel.setText(MODULE_NAME_UI);
- GridData data = new GridData();
- projectNameLabel.setLayoutData(data);
- // set up project name entry field
- moduleNameText = new Text(parent, SWT.BORDER);
- data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = SIZING_TEXT_FIELD_WIDTH;
- moduleNameText.setLayoutData(data);
- new Label(parent, SWT.NONE); // pad
- synchHelper.synchText(moduleNameText, PROJECT_NAME, new Control[]{projectNameLabel});
- moduleNameText.setFocus();
- }
-
- private void createEJBComponentSection(Composite parent) {
- selectedProjectLabel = new Label(parent, SWT.NONE);
- selectedProjectLabel.setText(EJBUIMessages.EJB_Project);
- GridData data = new GridData();
- selectedProjectLabel.setLayoutData(data);
-
- selectedProjectName = new Text(parent, SWT.BORDER);
- data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = SIZING_TEXT_FIELD_WIDTH;
- selectedProjectName.setLayoutData(data);
- new Label(parent, SWT.NONE); // pad
- selectedProjectName.setEditable(false);
- synchHelper.synchText(selectedProjectName, EJB_PROJECT_NAME, new Control[]{selectedProjectLabel});
- }
-
-
-
- private void handleHasClientJar() {
- EJBArtifactEdit edit = null;
- try {
- if (module != null) {
- IProject proj = StructureEdit.getContainingProject(module);
- edit = EJBArtifactEdit.getEJBArtifactEditForRead(proj);
- if (edit != null && edit.hasEJBClientJARProject())
- enableAllSections(false);
- } else
- enableAllSections(true);
- } finally {
- if(edit != null)
- edit.dispose();
-
- }
- }
-
- private void enableAllSections(boolean state) {
- selectedProjectLabel.setEnabled(state);
- selectedProjectName.setEnabled(state);
- clientJarURILabel.setEnabled(state);
- clientJarURI.setEnabled(state);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#getValidationPropertyNames()
- */
- protected String[] getValidationPropertyNames() {
- return new String[]{EJB_PROJECT_NAME, CLIENT_URI };
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#showValidationErrorsOnEnter()
- */
- protected boolean showValidationErrorsOnEnter() {
- return true;
- }
-
-
- public void dispose() {
- if (newModuleGroup != null)
- newModuleGroup.dispose();
- super.dispose();
- }
-
- protected void enter() {
- super.enter();
-// if (newModuleGroup!=null)
-// newModuleGroup.initializeProjectList();
- }
-
- private void createClientJarURISection(Composite parent) {
- // set up project name label
- clientJarURILabel = new Label(parent, SWT.NONE);
- clientJarURILabel.setText(EJBUIMessages.Client_JAR_URI + " ");
- GridData data = new GridData();
- clientJarURILabel.setLayoutData(data);
-
- clientJarURI = new Text(parent, SWT.BORDER);
- data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = SIZING_TEXT_FIELD_WIDTH;
- clientJarURI.setLayoutData(data);
- new Label(parent, SWT.NONE); // pad
- synchHelper.synchText(clientJarURI, CLIENT_URI, new Control[]{clientJarURILabel});
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBComponentCreationWizard.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBComponentCreationWizard.java
deleted file mode 100644
index 0a8ce8a..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBComponentCreationWizard.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ejb.ui.internal.wizard;
-
-import org.eclipse.jst.ejb.ui.internal.util.EJBUIMessages;
-import org.eclipse.jst.j2ee.ejb.datamodel.properties.IEjbComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.ejb.archiveoperations.EjbComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentCreationWizard;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.IDMPageHandler;
-
-/**
- * <p>
- * Wizard used to create J2EE Enterprise Java Bean (EJB) module structures in Eclipse Projects.
- * </p>
- */
-
-/**
- * @deprecated
- * @see EjbProjectWizard
- */
-public final class EJBComponentCreationWizard extends J2EEComponentCreationWizard implements IEjbComponentCreationDataModelProperties {
-
- /**
- * <p>
- * The Wizard ID of the ConnectorModuleCreationWizard. Used for internal purposes and activities
- * management.
- * </p>
- */
- public static final String WIZARD_ID = EJBComponentCreationWizard.class.getName();
-
- /**
- * <p>
- * The identifer for the EJB Client page
- * </p>
- */
- protected static final String CLIENT_PG = "client"; //$NON-NLS-1$
-
- /* A convenience reference to the client page. Initialized in doAddPages() */
- private EJBClientComponentCreationWizardPage clientPage;
-
- /**
- * <p>
- * The default constructor. Creates a wizard with no selection, no model instance, and no
- * operation instance. The model and operation will be created as needed.
- * </p>
- */
- public EJBComponentCreationWizard() {
- super();
- }
-
- /**
- * <p>
- * The model is used to prepopulate the wizard controls and interface with the operation.
- * </p>
- *
- * @param model
- * The model parameter is used to pre-populate wizard controls and interface with the
- * operation
- */
- public EJBComponentCreationWizard(IDataModel model) {
- super(model);
- }
-
- /**
- * {@inheritDoc}
- *
- * <p>
- * Sets up the dialog window title and default page image.
- * </p>
- *
- */
- protected void doInit() {
- setWindowTitle(EJBUIMessages.EJB_PROJECT_WIZ_TITLE);
- setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EJB_PROJECT_WIZARD_BANNER));
- preFillSelectedEARProject();
- }
-
- /**
- * {@inheritDoc}
- *
- * <p>
- * Skips the EJB Client settings page based on the return value of shouldSkipClientPage()
- * </p>
- */
- public String getNextPage(String currentPageName, String expectedNextPageName) {
- if (shouldSkipClientPage() && expectedNextPageName.equals(CLIENT_PG)) {
- return IDMPageHandler.PAGE_AFTER;
- }
- return super.getNextPage(currentPageName, expectedNextPageName);
- }
-
-
- /**
- * {@inheritDoc}
- *
- * <p>
- * Skips the EJB Client settings page based on the return value of shouldSkipClientPage()
- * </p>
- *
- */
- public String getPreviousPage(String currentPageName, String expectedPreviousPageName) {
- if (shouldSkipClientPage() && expectedPreviousPageName.equals(CLIENT_PG)) {
- return MAIN_PG;
- }
- return super.getPreviousPage(currentPageName, expectedPreviousPageName);
- }
-
- /**
- * {@inheritDoc}
- *
- * <p>
- * Adds a {@link EJBComponentCreationWizardPage} as the
- * {@link J2EEComponentCreationWizard#MAIN_PG} and a {@link EJBClientCreationWizardPage} as the
- * {@link #CLIENT_PG}.
- * </p>
- */
- public void doAddPages() {
- addPage(new EJBComponentCreationWizardPage(getDataModel(), MAIN_PG));
- clientPage = new EJBClientComponentCreationWizardPage((IDataModel) getDataModel().getProperty(NESTED_MODEL_EJB_CLIENT_CREATION), CLIENT_PG);
- addPage(clientPage);
- super.doAddPages();
- }
-
- /**
- * {@inheritDoc}
- *
- * @see org.eclipse.jface.wizard.IWizard#canFinish()
- * @return true if the parent Wizard class is ready and EJB Client Creation settings are
- * complete
- */
- public boolean canFinish() {
- if (!getDataModel().getBooleanProperty(CREATE_CLIENT)) {
- clientPage.setPageComplete(true);
- }
- return super.canFinish();
- }
-
- /**
- * @return true if the client page should be skipped (based on the value of
- * {@see EJBProjectCreationDataModel#CREATE_CLIENT}.
- */
- protected final boolean shouldSkipClientPage() {
- return !getDataModel().getBooleanProperty(CREATE_CLIENT);
- }
-
- protected IDataModelProvider getDefaultProvider() {
- return new EjbComponentCreationDataModelProvider();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBComponentCreationWizardPage.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBComponentCreationWizardPage.java
deleted file mode 100644
index 8a2d7eb..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBComponentCreationWizardPage.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.ejb.ui.internal.wizard;
-
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jst.ejb.ui.internal.util.EJBUIMessages;
-import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel;
-import org.eclipse.jst.j2ee.ejb.datamodel.properties.IEjbComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.wizard.DataModelAnnotationsStandaloneGroup;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentCreationWizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class EJBComponentCreationWizardPage extends J2EEComponentCreationWizardPage implements IEjbComponentCreationDataModelProperties {
- protected Button addClient;
- protected DataModelAnnotationsStandaloneGroup annotationsGroup;
-
- // private Button addDefaultBean;
-
- /**
- * @param model
- * @param pageName
- */
- public EJBComponentCreationWizardPage(IDataModel model, String pageName) {
- super(model, pageName);
- setTitle(EJBUIMessages.EJB_PROJECT_MAIN_PG_TITLE);
- setDescription(EJBUIMessages.EJB_PROJECT_MAIN_PG_DESC);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EJB_PROJECT_WIZARD_BANNER));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.ui.wizard.J2EEModuleCreationPage#addToAdvancedComposite(org.eclipse.swt.widgets.Composite)
- */
- protected void addToAdvancedComposite(Composite advanced) {
- super.addToAdvancedComposite(advanced);
- createEJBClientGroup(advanced);
- super.createSourceFolderComposite(advanced);
- createAnnotationsGroup(advanced);
- // createDefaultBean(advanced);
- }
-
- /**
- * @param advanced
- */
- // private void createDefaultBean(Composite advanced) {
- // addDefaultBean = new Button(advanced, SWT.CHECK);
- // addDefaultBean.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.CREATE_DEFAULT_SESSION_BEAN));
- // synchHelper.synchCheckbox(addDefaultBean,
- // EJBModuleCreationDataModel.CREATE_DEFAULT_SESSION_BEAN, null);
- // GridData gd1 = new GridData(GridData.FILL_HORIZONTAL);
- // gd1.horizontalSpan = 3;
- // addDefaultBean.setLayoutData(gd1);
- //
- // }
- /**
- * @param advanced
- */
- private void createAnnotationsGroup(Composite parent) {
- annotationsGroup = new DataModelAnnotationsStandaloneGroup(parent, getDataModel(), false, synchHelper);
- }
-
- /**
- * @param composite
- */
- private void createEJBClientGroup(Composite parent) {
- // Create Add Client checkbox
- new Label(parent, SWT.NONE);
- addClient = new Button(parent, SWT.CHECK);
- addClient.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.CREATE_EJB_CLIENT_JAR));
- synchHelper.synchCheckbox(addClient, CREATE_CLIENT, null);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- addClient.setLayoutData(gd);
- }
-
- protected String getVersionLabel() {
- return EJBUIMessages.EJB_VERSION_LBL;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.ui.wizard.J2EEModuleCreationPage#getValidationPropertyNames()
- */
- protected String[] getValidationPropertyNames() {
- String[] names = super.getValidationPropertyNames();
- String[] allNames = new String[names.length + 2];
- System.arraycopy(names, 0, allNames, 0, names.length);
- allNames[names.length] = CREATE_CLIENT;
- allNames[names.length + 1] = IAnnotationsDataModel.USE_ANNOTATIONS;
- return allNames;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.ui.wizard.J2EEProjectCreationPage#dispose()
- */
- public void dispose() {
- super.dispose();
- if (annotationsGroup != null)
- annotationsGroup.dispose();
- }
-
- public void storeDefaultSettings() {
- super.storeDefaultSettings();
- IDialogSettings settings = getDialogSettings();
- if (settings != null)
- settings.put(getAddDefaultBeanKey(), model.getBooleanProperty(CREATE_DEFAULT_SESSION_BEAN));
- }
-
-
- protected String getAddDefaultBeanKey() {
- return getClass().getName() + "_ADD_DEFAULT_BEAN"; //$NON-NLS-1$
- }
-
- protected void restoreDefaultSettings() {
- super.restoreDefaultSettings();
- IDialogSettings settings = getDialogSettings();
- if (settings != null)
- model.setBooleanProperty(CREATE_DEFAULT_SESSION_BEAN, settings.getBoolean(getAddDefaultBeanKey()));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.ui.wizard.J2EEProjectCreationPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
- */
- protected Composite createTopLevelComposite(Composite parent) {
- setInfopopID(IJ2EEUIContextIds.NEW_EJB_WIZARD_P1);
- return super.createTopLevelComposite(parent);
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBComponentExportWizard.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBComponentExportWizard.java
deleted file mode 100644
index 9b32815..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBComponentExportWizard.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ejb.ui.internal.wizard;
-
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.EJBComponentExportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEArtifactExportWizard;
-import org.eclipse.ui.IExportWizard;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-
-/**
- * <p>
- * Wizard used to export J2EE Enterprise Java Bean module structures
- * from the Eclipse Workbench to a deployable Enterprise Java Bean
- * Archive *.jar file.
- * </p>
- */
-public final class EJBComponentExportWizard extends J2EEArtifactExportWizard implements IExportWizard {
-
- /**
- * <p>
- * The default constructor. Creates a wizard with no selection,
- * no model instance, and no operation instance. The model and
- * operation will be created as needed.
- * </p>
- */
- public EJBComponentExportWizard() {
- super();
- }
-
- /**
- * <p>
- * The model is used to prepopulate the wizard controls
- * and interface with the operation.
- * </p>
- * @param model The model parameter is used to pre-populate wizard controls and interface with the operation
- */
- public EJBComponentExportWizard(IDataModel model) {
- super(model);
- }
-
- protected IDataModelProvider getDefaultProvider() {
- return new EJBComponentExportDataModelProvider();
- }
- /**
- * <p>
- * Adds the following pages:
- * <ul>
- * <li> {@link EJBExportPage} as the main wizard page ({@link #MAIN_PG})
- * </ul>
- * </p>
- */
- public void doAddPages() {
- addPage(new EJBExportPage(getDataModel(), MAIN_PG, getSelection()));
- }
-
- /**
- * {@inheritDoc}
- *
- * <p>
- * Sets up the default wizard page image.
- * </p>
- */
- protected void doInit() {
- setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EJB_EXPORT_WIZARD_BANNER));
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBComponentImportPage.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBComponentImportPage.java
deleted file mode 100644
index b19b4d8..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBComponentImportPage.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ejb.ui.internal.wizard;
-
-import org.eclipse.jst.ejb.ui.internal.util.EJBUIMessages;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleImportPage;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class EJBComponentImportPage extends J2EEModuleImportPage {
- /**
- * @param model
- * @param pageName
- */
- public EJBComponentImportPage(IDataModel model, String pageName) {
- super(model, pageName);
- setTitle(EJBUIMessages.EJB_IMPORT_MAIN_PG_TITLE);
- setDescription(EJBUIMessages.EJB_IMPORT_MAIN_PG_DESC);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EJB_IMPORT_WIZARD_BANNER));
- }
-
- protected String getFileNamesStoreID() {
- return "EJB";//$NON-NLS-1$
- }
-
- protected String getFileImportLabel() {
- return EJBUIMessages.EJB_JAR_FILE_LBL;
- }
-
- protected String[] getFilterExpression() {
- return new String[]{"*.jar"}; //$NON-NLS-1$
- }
-
- protected String getProjectImportLabel() {
- return EJBUIMessages.EJB_PROJECT_LBL;
- }
-
- protected Composite createTopLevelComposite(Composite parent) {
- setInfopopID(IJ2EEUIContextIds.IMPORT_EJB_WIZARD_P1);
- return super.createTopLevelComposite(parent);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.ui.wizard.J2EEModuleImportPage#createAnnotationsStandaloneGroup(org.eclipse.swt.widgets.Composite)
- */
- protected void createAnnotationsStandaloneGroup(Composite composite) {
- // new AnnotationsStandaloneGroup(composite, getEJBDataModel(), false);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBComponentImportWizard.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBComponentImportWizard.java
deleted file mode 100644
index e24199b..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBComponentImportWizard.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ejb.ui.internal.wizard;
-
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.EJBComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentImportWizard;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-
-/**
- * <p>
- * Wizard used to import J2EE Enterprise Java Bean module structures into the Eclipse Workbench from
- * an existing Enteprise Java Bean *.jar file.
- * </p>
- */
-public final class EJBComponentImportWizard extends J2EEComponentImportWizard {
-
- /**
- * <p>
- * The default constructor. Creates a wizard with no selection, no model instance, and no
- * operation instance. The model and operation will be created as needed.
- * </p>
- */
- public EJBComponentImportWizard() {
- super();
- }
-
- /**
- * <p>
- * The model is used to prepopulate the wizard controls and interface with the operation.
- * </p>
- *
- * @param model
- * The model parameter is used to pre-populate wizard controls and interface with the
- * operation
- */
- public EJBComponentImportWizard(IDataModel model) {
- super(model);
- }
-
- /**
- * <p>
- * Adds an {@link EJBComponentImportPage} as the main wizard page ({@link #MAIN_PG}).
- * </p>
- */
- public void doAddPages() {
- addPage(new EJBComponentImportPage(getDataModel(), MAIN_PG));
- }
-
- /**
- * {@inheritDoc}
- *
- * <p>
- * Sets up the dialog window title and default wizard page image.
- * </p>
- */
- public final void doInit() {
- setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.IMPORT_WIZ_TITLE));
- setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EJB_IMPORT_WIZARD_BANNER));
- // updateEARToModelFromSelection(getSpecificDataModel());
- }
-
- protected String[] getModuleValidatorStrings() {
- return new String[]{"org.eclipse.jst.j2ee.model.internal.validation.EJBValidator"}; //$NON-NLS-1$
- }
-
- protected IDataModelProvider getDefaultProvider() {
- return new EJBComponentImportDataModelProvider();
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBExportPage.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBExportPage.java
deleted file mode 100644
index b721537..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBExportPage.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Dec 3, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.ejb.ui.internal.wizard;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ejb.ui.internal.util.EJBUIMessages;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleExportPage;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class EJBExportPage extends J2EEModuleExportPage {
- /**
- * @param model
- * @param pageName
- */
- public EJBExportPage(IDataModel model, String pageName, IStructuredSelection selection) {
- super(model, pageName, selection);
- setTitle(EJBUIMessages.EJB_EXPORT_MAIN_PG_TITLE);
- setDescription(EJBUIMessages.EJB_EXPORT_MAIN_PG_DESC);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EJB_EXPORT_WIZARD_BANNER));
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.ui.wizard.J2EEImportPage#getProjectImportLabel()
- */
- protected String getComponentLabel() {
- return J2EEUIMessages.getResourceString(J2EEUIMessages.EJB_PROJ_LBL);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.ui.wizard.J2EEImportPage#getFilterExpression()
- */
- protected String[] getFilterExpression() {
- return new String[]{"*.jar"}; //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.ui.wizard.J2EEExportPage#isMetaTypeSupported(java.lang.Object)
- */
- protected boolean isMetaTypeSupported(Object o) {
- return o instanceof org.eclipse.jst.j2ee.ejb.EJBJar;
- }
-
- protected String getInfopopID() {
- return IJ2EEUIContextIds.EXPORT_EJB_WIZARD_P1;
- }
-
- protected String getCompnentID() {
- return "JST_EJB"; //$NON-NLS-1$
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBFiguresResourceHandler.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBFiguresResourceHandler.java
deleted file mode 100644
index 8bfe3d6..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBFiguresResourceHandler.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ejb.ui.internal.wizard;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class EJBFiguresResourceHandler extends NLS {
-
- private static final String BUNDLE_NAME = "ejb_figures";//$NON-NLS-1$
-
- private EJBFiguresResourceHandler() {
- // Do not instantiate
- }
-
- public static String RelationshipPolyLine_UI_0;
- public static String RelationshipPolyLine_UI_1;
- public static String RelationshipPolyLine_UI_2;
- public static String RelationshipPolyLine_UI_3;
- public static String RelationshipPolyLine_UI_4;
- public static String RelationshipPolyLine_UI_5;
- public static String RelationshipPolyLine_UI_6;
- public static String RelationshipPolyLine_UI_7;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, EJBFiguresResourceHandler.class);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/project/facet/EjbFacetInstallPage.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/project/facet/EjbFacetInstallPage.java
deleted file mode 100644
index 86118a7..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/project/facet/EjbFacetInstallPage.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package org.eclipse.jst.ejb.ui.project.facet;
-
-import org.eclipse.jst.ejb.ui.internal.util.EJBUIMessages;
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.IEjbFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleFacetInstallPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-
-
-public class EjbFacetInstallPage extends J2EEModuleFacetInstallPage
- implements IEjbFacetInstallDataModelProperties{
-
- private static final String MODULE_NAME_UI = J2EEUIMessages.getResourceString(J2EEUIMessages.NAME_LABEL); //$NON-NLS-1$
-
- private Text configFolder;
- private Label configFolderLabel;
- protected Button addClient;
- protected Text clientNameText = null;
- private Label clientJarURILabel;
- private Text clientJarURI;
-
- public EjbFacetInstallPage() {
- super("ejb.facet.install.page");
- setTitle(EJBUIMessages.pageTitle);
- setDescription(EJBUIMessages.pageDescription);
- }
-
- protected String[] getValidationPropertyNames() {
- return new String[]{EAR_PROJECT_NAME, CREATE_CLIENT, CLIENT_NAME, CLIENT_SOURCE_FOLDER, CLIENT_URI};
- }
-
-
- protected Composite createTopLevelComposite(Composite parent) {
- final Composite composite = new Composite(parent, SWT.NONE);
- composite.setLayout(new GridLayout(1, false));
-
- //setupEarControl(composite);
-
- this.configFolderLabel = new Label(composite, SWT.NONE);
- this.configFolderLabel.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.SOURCEFOLDER));
- this.configFolderLabel.setLayoutData(gdhfill());
-
- this.configFolder = new Text(composite, SWT.BORDER);
- this.configFolder.setLayoutData(gdhfill());
- this.configFolder.setData("label", this.configFolderLabel); //$NON-NLS-1$
- synchHelper.synchText(configFolder, CONFIG_FOLDER, null);
-
- createEJBClientGroup( composite );
- createProjectNameGroup( composite );
- createClientJarURISection( composite );
- return composite;
- }
-
- private void createEJBClientGroup(Composite parent) {
- // Create Add Client checkbox
- new Label(parent, SWT.NONE);
- addClient = new Button(parent, SWT.CHECK);
- addClient.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.CREATE_EJB_CLIENT_JAR));
- synchHelper.synchCheckbox(addClient, CREATE_CLIENT, null);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- addClient.setLayoutData(gd);
- synchHelper.synchCheckbox(addClient, CREATE_CLIENT, null);
- }
-
- private void createProjectNameGroup(Composite parent) {
- // set up project name label
- Label projectNameLabel = new Label(parent, SWT.NONE);
- projectNameLabel.setText(MODULE_NAME_UI);
- GridData data = new GridData();
- projectNameLabel.setLayoutData(data);
- // set up project name entry field
- clientNameText = new Text(parent, SWT.BORDER);
- data = new GridData(GridData.FILL_HORIZONTAL);
- //data.widthHint = SIZING_TEXT_FIELD_WIDTH;
- clientNameText.setLayoutData(data);
- new Label(parent, SWT.NONE); // pad
- synchHelper.synchText(clientNameText, CLIENT_NAME, new Control[]{projectNameLabel});
- clientNameText.setFocus();
- }
-
- private void createClientJarURISection(Composite parent) {
- // set up project name label
- clientJarURILabel = new Label(parent, SWT.NONE);
- clientJarURILabel.setText(EJBUIMessages.Client_JAR_URI + " ");
- GridData data = new GridData();
- clientJarURILabel.setLayoutData(data);
-
- clientJarURI = new Text(parent, SWT.BORDER);
- data = new GridData(GridData.FILL_HORIZONTAL);
- //data.widthHint = SIZING_TEXT_FIELD_WIDTH;
- clientJarURI.setLayoutData(data);
- new Label(parent, SWT.NONE); // pad
- synchHelper.synchText(clientJarURI, CLIENT_URI, new Control[]{clientJarURILabel});
- }
-}
diff --git a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/project/facet/EjbProjectFirstPage.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/project/facet/EjbProjectFirstPage.java
deleted file mode 100644
index c5e8b34..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/project/facet/EjbProjectFirstPage.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.eclipse.jst.ejb.ui.project.facet;
-
-import org.eclipse.jst.ejb.ui.internal.util.EJBUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentFacetCreationWizardPage;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class EjbProjectFirstPage extends J2EEComponentFacetCreationWizardPage {
-
- protected String getModuleFacetID() {
- return J2EEProjectUtilities.EJB;
- }
-
- public EjbProjectFirstPage(IDataModel model, String pageName) {
- super(model, pageName);
- setTitle(EJBUIMessages.EJB_PROJECT_MAIN_PG_TITLE);
- setDescription(EJBUIMessages.EJB_PROJECT_MAIN_PG_DESC);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EJB_PROJECT_WIZARD_BANNER));
- }
-
-}
diff --git a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/project/facet/EjbProjectWizard.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/project/facet/EjbProjectWizard.java
deleted file mode 100644
index b715bf5..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/project/facet/EjbProjectWizard.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.eclipse.jst.ejb.ui.project.facet;
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jst.ejb.ui.internal.util.EJBUIMessages;
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.EjbFacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWizard;
-import org.osgi.framework.Bundle;
-
-public class EjbProjectWizard extends NewProjectDataModelFacetWizard {
-
- public EjbProjectWizard(IDataModel model){
- super(model);
- setWindowTitle(EJBUIMessages.KEY_1);
- }
-
- public EjbProjectWizard(){
- super();
- setWindowTitle(EJBUIMessages.KEY_1);
- }
-
- protected IDataModel createDataModel() {
- return DataModelFactory.createDataModel(new EjbFacetProjectCreationDataModelProvider());
- }
-
- protected IFacetedProjectTemplate getTemplate() {
- return ProjectFacetsManager.getTemplate("template.jst.ejb"); //$NON-NLS-1$
- }
-
- protected IWizardPage createFirstPage() {
- return new EjbProjectFirstPage(model, "first.page"); //$NON-NLS-1$
- }
-
- protected ImageDescriptor getDefaultPageImageDescriptor() {
- final Bundle bundle = Platform.getBundle("org.eclipse.jst.ejb.ui"); //$NON-NLS-1$
- final URL url = bundle.getEntry("icons/full/wizban/ejbproject_wiz.gif"); //$NON-NLS-1$
- return ImageDescriptor.createFromURL(url);
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/20_cmpbean_obj.gif b/plugins/org.eclipse.jst.ejb.ui/icons/20_cmpbean_obj.gif
deleted file mode 100644
index 023fe8d..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/20_cmpbean_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/adown.gif b/plugins/org.eclipse.jst.ejb.ui/icons/adown.gif
deleted file mode 100644
index 91e708f..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/adown.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/appclientgroup_obj.gif b/plugins/org.eclipse.jst.ejb.ui/icons/appclientgroup_obj.gif
deleted file mode 100644
index 2768428..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/appclientgroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/arrow_down.gif b/plugins/org.eclipse.jst.ejb.ui/icons/arrow_down.gif
deleted file mode 100644
index 3c455c9..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/arrow_down.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/arrowp.gif b/plugins/org.eclipse.jst.ejb.ui/icons/arrowp.gif
deleted file mode 100644
index a906320..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/arrowp.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/cascade_left.gif b/plugins/org.eclipse.jst.ejb.ui/icons/cascade_left.gif
deleted file mode 100644
index 788e76d..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/cascade_left.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/cascade_left2.gif b/plugins/org.eclipse.jst.ejb.ui/icons/cascade_left2.gif
deleted file mode 100644
index 3e31054..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/cascade_left2.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/cascade_right.gif b/plugins/org.eclipse.jst.ejb.ui/icons/cascade_right.gif
deleted file mode 100644
index 573b60f..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/cascade_right.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/cmp.gif b/plugins/org.eclipse.jst.ejb.ui/icons/cmp.gif
deleted file mode 100644
index 20ed1f9..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/cmp.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/connectorgroup_obj.gif b/plugins/org.eclipse.jst.ejb.ui/icons/connectorgroup_obj.gif
deleted file mode 100644
index ad3af3c..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/connectorgroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/deadend.gif b/plugins/org.eclipse.jst.ejb.ui/icons/deadend.gif
deleted file mode 100644
index 5df6193..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/deadend.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/eargroup_obj.gif b/plugins/org.eclipse.jst.ejb.ui/icons/eargroup_obj.gif
deleted file mode 100644
index 2eeb3ef..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/eargroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/ejbgroup_obj.gif b/plugins/org.eclipse.jst.ejb.ui/icons/ejbgroup_obj.gif
deleted file mode 100644
index b0adb3e..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/ejbgroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/folder.gif b/plugins/org.eclipse.jst.ejb.ui/icons/folder.gif
deleted file mode 100644
index c91b267..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/folder.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/clcl16/ejb_client_remove_action_obj.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/clcl16/ejb_client_remove_action_obj.gif
deleted file mode 100644
index 1823211..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/clcl16/ejb_client_remove_action_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/clcl16/ejb_deploy_action_obj.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/clcl16/ejb_deploy_action_obj.gif
deleted file mode 100644
index db8945f..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/clcl16/ejb_deploy_action_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/appclient_export.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/appclient_export.gif
deleted file mode 100644
index 6f83300..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/appclient_export.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/appclient_import_wiz.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/appclient_import_wiz.gif
deleted file mode 100644
index ce667f4..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/appclient_import_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/ejbclientjar_wiz.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/ejbclientjar_wiz.gif
deleted file mode 100644
index 6e65e7d..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/ejbclientjar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/export_ear.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/export_ear.gif
deleted file mode 100644
index 2270b17..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/export_ear.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/export_ejbjar_wiz.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/export_ejbjar_wiz.gif
deleted file mode 100644
index 72cd417..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/export_ejbjar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/export_rar.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/export_rar.gif
deleted file mode 100644
index befb3d4..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/export_rar.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/exportwar_wiz.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/exportwar_wiz.gif
deleted file mode 100644
index ced859d..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/exportwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/import_ear.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/import_ear.gif
deleted file mode 100644
index 099201b..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/import_ear.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/import_ejbjar.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/import_ejbjar.gif
deleted file mode 100644
index 5644b48..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/import_ejbjar.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/import_rar.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/import_rar.gif
deleted file mode 100644
index 50f25a2..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/import_rar.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/importwar_wiz.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/importwar_wiz.gif
deleted file mode 100644
index 432c066..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/importwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/newappclient_wiz.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/newappclient_wiz.gif
deleted file mode 100644
index 0ce86a1..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/newappclient_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/newconnectionprj_wiz.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/newconnectionprj_wiz.gif
deleted file mode 100644
index 1bec6ba..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/newconnectionprj_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/newear_wiz.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/newear_wiz.gif
deleted file mode 100644
index 8b409b5..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/newear_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/newejbprj_wiz.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/newejbprj_wiz.gif
deleted file mode 100644
index ecda22b..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/newejbprj_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/newwar_wiz.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/newwar_wiz.gif
deleted file mode 100644
index b9ac6be..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/ctool16/newwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/cview16/j2ee_view.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/cview16/j2ee_view.gif
deleted file mode 100644
index 20acd4c..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/cview16/j2ee_view.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/dlcl16/ejb_client_remove_action_obj.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/dlcl16/ejb_client_remove_action_obj.gif
deleted file mode 100644
index 928a0bf..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/dlcl16/ejb_client_remove_action_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/dlcl16/ejb_deploy_action_obj.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/dlcl16/ejb_deploy_action_obj.gif
deleted file mode 100644
index 9657388..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/dlcl16/ejb_deploy_action_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/13_ear_obj.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/13_ear_obj.gif
deleted file mode 100644
index 54b9b17..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/13_ear_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/21_cmpbean_obj.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/21_cmpbean_obj.gif
deleted file mode 100644
index 35835bc..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/21_cmpbean_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/21_ejb_obj.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/21_ejb_obj.gif
deleted file mode 100644
index 673ba6a..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/21_ejb_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/21_ejbjar_wiz.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/21_ejbjar_wiz.gif
deleted file mode 100644
index 9dae052..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/21_ejbjar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/annotation_positioned_overlay.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/annotation_positioned_overlay.gif
deleted file mode 100644
index cec1d2d..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/annotation_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/appclient_14.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/appclient_14.gif
deleted file mode 100644
index b248380..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/appclient_14.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/appclient_14_deploy.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/appclient_14_deploy.gif
deleted file mode 100644
index b0d08af..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/appclient_14_deploy.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/extwebserviceitemprovider_obj.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/extwebserviceitemprovider_obj.gif
deleted file mode 100644
index f4cc6e3..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/extwebserviceitemprovider_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/home_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/home_interface_positioned_overlay.gif
deleted file mode 100644
index 91a756a..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/home_interface_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/local_home_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/local_home_interface_positioned_overlay.gif
deleted file mode 100644
index e5d6090..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/local_home_interface_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/local_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/local_interface_positioned_overlay.gif
deleted file mode 100644
index 156febe..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/local_interface_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/remote_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/remote_interface_positioned_overlay.gif
deleted file mode 100644
index 203e398..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/remote_interface_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/service_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/service_interface_positioned_overlay.gif
deleted file mode 100644
index 6146667..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/service_interface_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/webServiceItemProvider_obj.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/webServiceItemProvider_obj.gif
deleted file mode 100644
index 8fb844f..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/webServiceItemProvider_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/webServicesFolder_obj.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/webServicesFolder_obj.gif
deleted file mode 100644
index ab3039c..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/webServicesFolder_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/webapp_14.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/webapp_14.gif
deleted file mode 100644
index 83f9165..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/webapp_14.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/webapp_deploy.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/webapp_deploy.gif
deleted file mode 100644
index 80531e3..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/obj16/webapp_deploy.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/annotation_bean_overlay.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/annotation_bean_overlay.gif
deleted file mode 100644
index f277755..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/annotation_bean_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/annotation_positioned_overlay.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/annotation_positioned_overlay.gif
deleted file mode 100644
index cec1d2d..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/annotation_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/client_app_ovr.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/client_app_ovr.gif
deleted file mode 100644
index 3ff1ca5..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/client_app_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/connector_ovr.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/connector_ovr.gif
deleted file mode 100644
index b7e77bc..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/connector_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/dis_annotation_bean_overlay.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/dis_annotation_bean_overlay.gif
deleted file mode 100644
index dac498a..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/dis_annotation_bean_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/ejb_module_ovr.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/ejb_module_ovr.gif
deleted file mode 100644
index cf50d6d..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/ejb_module_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/enterprise_app_ovr.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/enterprise_app_ovr.gif
deleted file mode 100644
index ec19c47..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/enterprise_app_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/externalWebServiceOverlay_obj.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/externalWebServiceOverlay_obj.gif
deleted file mode 100644
index daff412..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/externalWebServiceOverlay_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/home_interface_overlay_obj.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/home_interface_overlay_obj.gif
deleted file mode 100644
index 48380fc..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/home_interface_overlay_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/home_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/home_interface_positioned_overlay.gif
deleted file mode 100644
index 91a756a..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/home_interface_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/key_interf_ov.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/key_interf_ov.gif
deleted file mode 100644
index 3070440..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/key_interf_ov.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/local_home_interface_overlay_obj.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/local_home_interface_overlay_obj.gif
deleted file mode 100644
index d782734..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/local_home_interface_overlay_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/local_home_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/local_home_interface_positioned_overlay.gif
deleted file mode 100644
index e5d6090..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/local_home_interface_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/local_interface_overlay_obj.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/local_interface_overlay_obj.gif
deleted file mode 100644
index 43e1655..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/local_interface_overlay_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/local_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/local_interface_positioned_overlay.gif
deleted file mode 100644
index 156febe..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/local_interface_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/remote_interface_overlay_obj.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/remote_interface_overlay_obj.gif
deleted file mode 100644
index 19c9cae..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/remote_interface_overlay_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/remote_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/remote_interface_positioned_overlay.gif
deleted file mode 100644
index 203e398..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/remote_interface_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/service_interface_overlay_obj.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/service_interface_overlay_obj.gif
deleted file mode 100644
index 93f0679..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/service_interface_overlay_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/service_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/service_interface_positioned_overlay.gif
deleted file mode 100644
index 6146667..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/service_interface_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/web_module_ovr.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/web_module_ovr.gif
deleted file mode 100644
index c1e9617..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/ovr16/web_module_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/add_mess_dest_wiz_ban.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/add_mess_dest_wiz_ban.gif
deleted file mode 100644
index f9941ce..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/add_mess_dest_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/add_web_service_handler_wiz.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/add_web_service_handler_wiz.gif
deleted file mode 100644
index e1fa98a..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/add_web_service_handler_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addauthoritycontraints_wiz_.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addauthoritycontraints_wiz_.gif
deleted file mode 100644
index 2ec0ffb..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addauthoritycontraints_wiz_.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addcmpfiled_wiz_ban.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addcmpfiled_wiz_ban.gif
deleted file mode 100644
index 879329e..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addcmpfiled_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addcontextparameter_wiz_ban.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addcontextparameter_wiz_ban.gif
deleted file mode 100644
index 6457e12..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addcontextparameter_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addenvirentry_wiz_ban.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addenvirentry_wiz_ban.gif
deleted file mode 100644
index 653ab02..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addenvirentry_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/adderrorcodeerror_wiz_ban.g.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/adderrorcodeerror_wiz_ban.g.gif
deleted file mode 100644
index 2eb9efe..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/adderrorcodeerror_wiz_ban.g.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addexceptionerrorpage_wiz_ban.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addexceptionerrorpage_wiz_ban.gif
deleted file mode 100644
index e12d2ac..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addexceptionerrorpage_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addfiltermapping_wiz_ban.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addfiltermapping_wiz_ban.gif
deleted file mode 100644
index 5b53010..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addfiltermapping_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addhandlersoapheader_wiz_ba.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addhandlersoapheader_wiz_ba.gif
deleted file mode 100644
index 189c3e9..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addhandlersoapheader_wiz_ba.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addjsppropgropu_wiz_ban.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addjsppropgropu_wiz_ban.gif
deleted file mode 100644
index 624fe7f..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addjsppropgropu_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addlocencodingmap_wiz_ban.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addlocencodingmap_wiz_ban.gif
deleted file mode 100644
index 46e3e08..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addlocencodingmap_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addmimemapping_wiz_ban.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addmimemapping_wiz_ban.gif
deleted file mode 100644
index bb856a4..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addmimemapping_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addservletmapping_wiz_ban.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addservletmapping_wiz_ban.gif
deleted file mode 100644
index 2820c5a..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addservletmapping_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addtaglibref_wiz_ban.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addtaglibref_wiz_ban.gif
deleted file mode 100644
index d238b56..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addtaglibref_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addwebSecuritycontraint_wiz.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addwebSecuritycontraint_wiz.gif
deleted file mode 100644
index fc97d84..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addwebSecuritycontraint_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addwebrescollection_wiz_ban.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addwebrescollection_wiz_ban.gif
deleted file mode 100644
index 7dfe6e9..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addwebrescollection_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addwebsecurityroleref_wiz_b.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addwebsecurityroleref_wiz_b.gif
deleted file mode 100644
index aab4b50..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addwebsecurityroleref_wiz_b.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addwelcomepage_wiz_ban.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addwelcomepage_wiz_ban.gif
deleted file mode 100644
index e0f50cc..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/addwelcomepage_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/appclient_wiz.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/appclient_wiz.gif
deleted file mode 100644
index 56d7fa7..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/appclient_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/connection_migration_wizard_wiz.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/connection_migration_wizard_wiz.gif
deleted file mode 100644
index e9ecba5..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/connection_migration_wizard_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/connector_wiz.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/connector_wiz.gif
deleted file mode 100644
index 231f8d3..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/connector_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/ear_wiz.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/ear_wiz.gif
deleted file mode 100644
index 625e763..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/ear_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/ejbclientjar_wizban.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/ejbclientjar_wizban.gif
deleted file mode 100644
index 231da61..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/ejbclientjar_wizban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/ejbproject_wiz.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/ejbproject_wiz.gif
deleted file mode 100644
index 7f2aa1e..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/ejbproject_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/export_appclient_wiz.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/export_appclient_wiz.gif
deleted file mode 100644
index 3515396..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/export_appclient_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/export_ear_wiz.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/export_ear_wiz.gif
deleted file mode 100644
index a327fa6..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/export_ear_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/export_ejbjar_obj.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/export_ejbjar_obj.gif
deleted file mode 100644
index adca79e..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/export_ejbjar_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/export_rar_wiz.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/export_rar_wiz.gif
deleted file mode 100644
index 6047f1a..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/export_rar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/export_war_wiz.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/export_war_wiz.gif
deleted file mode 100644
index d251242..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/export_war_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/import_appclient_wiz.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/import_appclient_wiz.gif
deleted file mode 100644
index 351a31d..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/import_appclient_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/import_ear_wiz.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/import_ear_wiz.gif
deleted file mode 100644
index 67754de..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/import_ear_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/import_ejbjar_wiz.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/import_ejbjar_wiz.gif
deleted file mode 100644
index d123519..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/import_ejbjar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/import_rar_wiz.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/import_rar_wiz.gif
deleted file mode 100644
index ea9dff4..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/import_rar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/import_war_wiz.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/import_war_wiz.gif
deleted file mode 100644
index 514274d..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/import_war_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/init_param_wiz_ban.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/init_param_wiz_ban.gif
deleted file mode 100644
index 3fb6df4..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/init_param_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/mdb_2_1_jms_creation_wiz.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/mdb_2_1_jms_creation_wiz.gif
deleted file mode 100644
index 51b1d5a..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/mdb_2_1_jms_creation_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/mdb_2_1_non_jms_creation_wi.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/mdb_2_1_non_jms_creation_wi.gif
deleted file mode 100644
index 51b1d5a..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/mdb_2_1_non_jms_creation_wi.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/versionmigrate3_wiz.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/versionmigrate3_wiz.gif
deleted file mode 100644
index 9b72bf5..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/versionmigrate3_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/war_wiz.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/war_wiz.gif
deleted file mode 100644
index d964e2e..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/war_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/web_library_project_wiz_ban.gif b/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/web_library_project_wiz_ban.gif
deleted file mode 100644
index 767a416..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/full/wizban/web_library_project_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/jar_obj.gif b/plugins/org.eclipse.jst.ejb.ui/icons/jar_obj.gif
deleted file mode 100644
index ec315d5..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/jar_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/jcu_obj.gif b/plugins/org.eclipse.jst.ejb.ui/icons/jcu_obj.gif
deleted file mode 100644
index 36a73ac..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/jcu_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/key_interf_ov.gif b/plugins/org.eclipse.jst.ejb.ui/icons/key_interf_ov.gif
deleted file mode 100644
index 3070440..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/key_interf_ov.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/left_arrow.gif b/plugins/org.eclipse.jst.ejb.ui/icons/left_arrow.gif
deleted file mode 100644
index 3bc3831..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/left_arrow.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/right_arrow.gif b/plugins/org.eclipse.jst.ejb.ui/icons/right_arrow.gif
deleted file mode 100644
index d03e351..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/right_arrow.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/servlet.gif b/plugins/org.eclipse.jst.ejb.ui/icons/servlet.gif
deleted file mode 100644
index fc1bece..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/servlet.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/sessionBean_obj.gif b/plugins/org.eclipse.jst.ejb.ui/icons/sessionBean_obj.gif
deleted file mode 100644
index 507b8a8..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/sessionBean_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/showerr_tsk.gif b/plugins/org.eclipse.jst.ejb.ui/icons/showerr_tsk.gif
deleted file mode 100644
index 0bc6068..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/showerr_tsk.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/showwarn_tsk.gif b/plugins/org.eclipse.jst.ejb.ui/icons/showwarn_tsk.gif
deleted file mode 100644
index 14009e9..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/showwarn_tsk.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/srvce_elem_obj.gif b/plugins/org.eclipse.jst.ejb.ui/icons/srvce_elem_obj.gif
deleted file mode 100644
index 6fdcb3f..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/srvce_elem_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/webgroup_obj.gif b/plugins/org.eclipse.jst.ejb.ui/icons/webgroup_obj.gif
deleted file mode 100644
index 274d361..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/webgroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/webservicedesc.gif b/plugins/org.eclipse.jst.ejb.ui/icons/webservicedesc.gif
deleted file mode 100644
index 8fb844f..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/webservicedesc.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/icons/wsdl.gif b/plugins/org.eclipse.jst.ejb.ui/icons/wsdl.gif
deleted file mode 100644
index 8fb844f..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/icons/wsdl.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.ejb.ui/plugin.properties b/plugins/org.eclipse.jst.ejb.ui/plugin.properties
deleted file mode 100644
index e0d36b0..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/plugin.properties
+++ /dev/null
@@ -1,96 +0,0 @@
-providerName=Eclipse.org
-
-j2ee=J2EE
-new.appclient.project.description_ui_=Create an Application Client project
-appclient.project_ui_=Application Client Project
-j2ee.view_ui_=Project Explorer
-ejb.class.java.editor_ui_=Enterprise Bean Java Editor
-ejb.extension.editor_ui_=EJB Extension Editor
-application.extension.editor_ui_=Application Extension Editor
-ejb.properties_ui_=EJB Properties
-client.jar.file_ui_=App Client JAR file
-client.import.description_ui_=Import an external Application Client JAR file into an Application Client project
-client.import.action.description_ui_=Import Application Client...
-client.export.description_ui_=Export an Application Client project into an Application Client JAR file
-client.export.action.description_ui_=Export Application Client...
-ear.file_ui_=EAR file
-ear.import.description_ui_=Import an external EAR file into an Enterprise Application project
-ear.import.action.description_ui_=Import EAR File...
-ear.export.description_ui_=Export an Enterprise Application project into an EAR file
-ear.export.action.description_ui_=Export EAR File...
-j2ee.category_ui_=J2EE
-ejb.project_ui_=EJB Project
-client.project_ui_=Application Client Project
-new.client.project.description_ui_=Create an Application Client project
-ear.project_ui_=Enterprise Application Project
-new.ear.project.description_ui_=Create an Enterprise Application project
-create.finders.action_ui_=Create Finders
-j2ee.actions.description_ui_=Actions for J2EE Development
-create.enterprise.application_ui_=Create an Enterprise Application
-create.web.module_ui_=Create a Web project
-create.web.project_ui_=Create a Web project
-create.client.module_ui_=Create an Application Client project
-create_servlet_ui_=Create Java Servlet file
-client.export.action.label_ui_=Export Application Client JAR...
-j2eeProjectDecorator=J2EE Project Decorator
-j2eeProjectDecorator.description=Adds a version decorator to J2EE projects.
-utilJarDeployableLabel=Project Utility JAR
-jar.dependency.editor_ui_=JAR Dependency Editor
-jar.dependencies.props_ui_=Java JAR Dependencies
-connector.import.action.label_ui_=Import RAR File...
-connector.export.action.label_ui_=Export RAR File...
-ejb.export.action.description_ui_=Export EJB JAR File...
-ejb.client.jar.creation.action.description_ui_=Create EJB Client Jar
-ejb.client.jar.removal.action.description_ui_=Remove EJB Client Jar
-migrate.menu_ui_=Migrate
-migrateJ2EEProjectStructure.action.label_ui_=J2EE Project Structure...
-migrateJ2EEProjectVersion.action.label_ui_=J2EE Version 1.2 to 1.3...
-openJ2EEMigrationWizard.action.label_ui_=J2EE Migration Wizard...
-enterprise.java.bean_session_ui_=Session Bean
-enterprise.java.bean_bmp_ui_=BMP Entity Bean
-enterprise.java.bean_cmp_ui_=CMP Entity Bean
-enterprise.java.bean_message_ui_=Message-Driven Bean
-emptyEJBGroupFilter.name=Empty EJB groups
-emptyEJBGroupFilter.description=Hides all empty EJB groups
-serverTarget.menu_ui_=Target Server
-ejbClientJAR.menu_ui=EJB Client JAR
-modifyServerTarget.action.label_ui_=Modify...
-syncServerTarget.action.label_ui_=Synchronize...
-classes.import.action.label_ui_=Import Class Files...
-ejb.action.set.description=Actions for EJB Development
-ejb.import.description_ui_=Import an external EJB JAR file into an EJB project
-ejb.import.action.description_ui_=Import EJB JAR File...
-ejb.export.description_ui_=Export an EJB project into an EJB JAR file
-ejb.export.action.description_ui_=Export EJB JAR File...
-new.ejb.project.description_ui_=Create an EJB project
-new_ejb_description_ui_=Create an enterprise bean
-connector.project_ui_=Connector Project
-new.connector.project.description_ui_=Create a Connector project
-war.import.description_ui_=Import an external WAR file into an Web project
-war.import.action.description_ui_=Import WAR File...
-war.export.description_ui_=Export a Web project into a WAR file
-war.export.action.description_ui_=Export WAR File...
-connector.import.description_ui_=Import an external Connector RAR file into a Connector project
-connector.export.description_ui_=Export a Connector project into a Connector RAR file
-connector.jar.file_ui_=RAR file
-ejb.category_ui_=EJB
-web.category_ui_=Web
-web.project_ui_=Dynamic Web Project
-new.web.project.description_ui_=Create a Dynamic Web project
-ejb.jar.file_ui_=EJB JAR file
-jca.project_ui_=Connector Project
-new.jca.project.description_ui_=Create a Connector project
-WarexportWizard.name=WAR file
-WarexportWizard.description=Export a Web Project into an external WAR file
-WarImportWizard.name=WAR file
-WarImportWizard.description=Import an external WAR file into a Web Project
-beanClassAnnotationDecorator=EJB Bean Class Annotation Decorator
-beanClassAnnotationDecorator.description=Adds decorator(s) to the Bean class of the Enterprise bean which is annotated.
-ejbAnnotationDecorator=Enterprise Bean Annotation Decorator
-ejbAnnotationDecorator.description=Adds decorator(s) to the Enterprise Bean which are annotated.
-#migration strings
-migrate.menu_ui_=Migrate
-openJ2EEMigrationWizard.action.label_ui_=J2EE Migration Wizard...
-migrateJ2EEProjectStructure.action.label_ui_=J2EE Project Structure...
-migrateJ2EEProjectVersion.action.label_ui_=J2EE Version 1.2 to 1.3...
-create.ejb.module_ui_=Create an EJB module
diff --git a/plugins/org.eclipse.jst.ejb.ui/plugin.xml b/plugins/org.eclipse.jst.ejb.ui/plugin.xml
deleted file mode 100644
index 92ad126..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/plugin.xml
+++ /dev/null
@@ -1,386 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-<!-- ====================================================== -->
-<!-- -->
-<!-- Purpose: Extension for the J2EE ACtion Sets -->
-<!-- Extension point: org.eclipse.ui.actionSets -->
-<!-- ====================================================== -->
- <extension
- point="org.eclipse.ui.actionSets">
-<!--EJB.UI extension Contribution-->
- <actionSet
- label="%ejb.category_ui_"
- description="%ejb.action.set.description"
- visible="false"
- id="org.eclipse.jst.j2ee.J2eeMainActionSet3">
- <action
- label="%create.ejb.module_ui_"
- icon="icons/full/ctool16/newejbprj_wiz.gif"
- tooltip="%create.ejb.module_ui_"
- class="org.eclipse.jst.ejb.ui.internal.actions.NewEJBComponentAction"
- toolbarPath="J2EEMain2"
- id="org.eclipse.jst.ejb.ui.internal.actions.NewEJBComponentAction">
- </action>
- </actionSet>
- </extension>
-
-<!--================================-->
-<!-- Export Wizard Contributions -->
-<!--================================-->
- <extension
- point="org.eclipse.ui.exportWizards">
- <wizard
- name="%ejb.jar.file_ui_"
- icon="icons/full/ctool16/export_ejbjar_wiz.gif"
- class="org.eclipse.jst.ejb.ui.internal.wizard.EJBComponentExportWizard"
- id="org.eclipse.jst.ejb.ui.EJBModuleExportWizard">
- <description>
- %ejb.export.description_ui_
- </description>
- <selection
- class="org.eclipse.core.resources.IResource">
- </selection>
- </wizard>
- </extension>
-
-<!-- New EJB Module Wizard -->
- <extension
- point="org.eclipse.ui.newWizards">
- <category
- name="%ejb.category_ui_"
- id="org.eclipse.jst.ejb.ui">
- </category>
- <wizard
- name="%ejb.project_ui_"
- icon="icons/full/ctool16/newejbprj_wiz.gif"
- category="org.eclipse.jst.ejb.ui"
- class="org.eclipse.jst.ejb.ui.project.facet.EjbProjectWizard"
- project="true"
- finalPerspective="org.eclipse.jst.j2ee.J2EEPerspective"
- id="org.eclipse.jst.ejb.ui.project.facet.EjbProjectWizard">
- <description>
- %new.ejb.project.description_ui_
- </description>
- </wizard>
- </extension>
-<!-- Navigator Object Contributions -->
-<!-- EJB Group Contributions
- <extension
- point="org.eclipse.ui.popupMenus">
- <objectContribution
- objectClass="org.eclipse.wst.common.navigator.internal.groups.NavigatorGroup"
- id="org.eclipse.jst.j2ee.internal.navigator.ui.ejbProjectActions">
- <action
- label="%ejb.jar.file_ui_"
- icon="icons/full/ctool16/import_ejbjar.gif"
- class="org.eclipse.jst.ejb.ui.internal.actions.ImportEJBAction"
- menubarPath="org.eclipse.wst.common.frameworks.internal.navigator.import.menu/additions"
- enablesFor="1"
- id="org.eclipse.jst.ejb.ui.internal.actions.ImportEJBAction">
- </action>
- <action
- label="%ejb.jar.file_ui_"
- icon="icons/full/ctool16/export_ejbjar_wiz.gif"
- class="org.eclipse.jst.ejb.ui.internal.actions.ExportEJBAction"
- menubarPath="org.eclipse.wst.common.frameworks.internal.navigator.export.menu/additions"
- enablesFor="1"
- id="org.eclipse.jst.ejb.ui.internal.actions.ExportEJBAction">
- </action>
- <visibility>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.ejb.EJBNature">
- </objectState>
- </visibility>
- </objectContribution>
- </extension>
- -->
-
-<!-- ====================================================== -->
-<!-- Label Decorators -->
-<!-- ====================================================== -->
-
- <extension
- point="org.eclipse.ui.decorators">
- <decorator
- lightweight="true"
- adaptable="true"
- label="%ejbAnnotationDecorator"
- class="org.eclipse.jst.j2ee.internal.ui.util.AnnotationIconDecorator"
- state="true"
- location="TOP_LEFT"
- id="org.eclipse.jst.j2ee.internal.ui.util.AnnotationIconDecorator_ejb">
- <description>
- %ejbAnnotationDecorator.description
- </description>
- <enablement>
- <or>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.ejb.provider.BeanClassProviderHelper">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.ejb.EnterpriseBean">
- </objectClass>
- </or>
- </enablement>
- </decorator>
- </extension>
-
- <extension point="org.eclipse.core.runtime.adapters">
- <factory
- class="org.eclipse.jst.ejb.ui.internal.deployables.EJBDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.core.resources.IProject">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- <factory
- class="org.eclipse.jst.ejb.ui.internal.deployables.EJBDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.jdt.core.ICompilationUnit">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- <factory
- class="org.eclipse.jst.ejb.ui.internal.deployables.EJBDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.core.resources.IFile">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- <factory
- class="org.eclipse.jst.ejb.ui.internal.deployables.EJBDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.jst.j2ee.ejb.EnterpriseBean">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- <factory
- class="org.eclipse.jst.ejb.ui.internal.deployables.EJBDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.jst.j2ee.ejb.EJBJar">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- </extension>
-
- <!-- ==================================================================== -->
-<!-- Purpose: Define adapters for EJB resources -->
-<!-- Extension point: org.eclipse.wst.server.core.moduleArtifactAdapters -->
-<!-- ==================================================================== -->
- <extension
- point="org.eclipse.wst.server.core.moduleArtifactAdapters">
- <moduleArtifactAdapter
- id="org.eclipse.jst.j2ee.server.ejb"
- class="org.eclipse.jst.ejb.ui.internal.deployables.EJBDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.jst.j2ee.ejb.EJBJar"/>
- </with>
- </enablement>
- </moduleArtifactAdapter>
- <moduleArtifactAdapter
- id="org.eclipse.jst.j2ee.server.ejb2"
- class="org.eclipse.jst.ejb.ui.internal.deployables.EJBDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.jst.j2ee.ejb.EnterpriseBean"/>
- </with>
- </enablement>
- </moduleArtifactAdapter>
- <moduleArtifactAdapter
- id="org.eclipse.jst.j2ee.server.ejb3"
- class="org.eclipse.jst.ejb.ui.internal.deployables.EJBDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.jdt.core.ICompilationUnit"/>
- </with>
- </enablement>
- </moduleArtifactAdapter>
- <moduleArtifactAdapter
- id="org.eclipse.jst.j2ee.server.ejb4"
- class="org.eclipse.jst.ejb.ui.internal.deployables.EJBDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.core.resources.IFile"/>
- </with>
- </enablement>
- </moduleArtifactAdapter>
- <moduleArtifactAdapter
- id="org.eclipse.jst.j2ee.server.ejb5"
- class="org.eclipse.jst.ejb.ui.internal.deployables.EJBDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.core.resources.IProject"/>
- </with>
- </enablement>
- </moduleArtifactAdapter>
- </extension>
-
-<!--================================-->
-<!-- Import Wizard Contributions -->
-<!--================================-->
-
- <extension
- point="org.eclipse.ui.importWizards">
- <wizard
- name="%ejb.jar.file_ui_"
- icon="icons/full/ctool16/import_ejbjar.gif"
- class="org.eclipse.jst.ejb.ui.internal.wizard.EJBComponentImportWizard"
- id="org.eclipse.jst.ejb.ui.EJBModuleImportWizardNew">
- <description>
- %ejb.import.description_ui_
- </description>
- <selection
- class="org.eclipse.core.resources.IResource">
- </selection>
- </wizard>
- </extension>
- <extension
- point="org.eclipse.wst.common.navigator.workbench.commonWizard">
- <!-- EJB New -->
- <commonWizard
- type="new"
- wizardId="org.eclipse.jst.ejb.ui.EJBComponentCreationWizard">
- <enablement>
- <or>
- <objectClass
- name="org.eclipse.core.resources.IWorkspaceRoot">
- </objectClass>
- <and>
- <objectClass
- name="org.eclipse.core.resources.IProject">
- </objectClass>
- <or>
- <objectState
- name="projectNature"
- value="org.eclipse.wst.common.modulecore.ModuleCoreNature">
- </objectState>
- </or>
- </and>
- <objectClass
- name="org.eclipse.jst.j2ee.application.Application">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.application.Module">
- </objectClass>
- </or>
- </enablement>
- </commonWizard>
- <!-- EJB Import -->
- <!-- <commonWizard
- type="import"
- wizardId="org.eclipse.jst.ejb.ui.EJBModuleImportWizard">
- <enablement>
- <or>
- <objectClass
- name="org.eclipse.core.resources.IWorkspaceRoot">
- </objectClass>
- <and>
- <objectClass
- name="org.eclipse.wst.common.navigator.internal.groups.NavigatorGroup">
- </objectClass>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.ejb.EJBNature">
- </objectState>
- </and>
- <and>
- <objectClass
- name="org.eclipse.core.resources.IProject">
- </objectClass>
- <or>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.EARNature">
- </objectState>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.ejb.EJBNature">
- </objectState>
- </or>
- </and>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.ejb.impl.EJBJarImpl">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.ejb.provider.GroupedEJBItemProvider">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.application.impl.ApplicationImpl">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.application.impl.ModuleImpl">
- </objectClass>
-
- </or>
- </enablement>
- </commonWizard> -->
- <!-- EJB Export -->
- <!-- <commonWizard
- type="export"
- wizardId="org.eclipse.jst.ejb.ui.EJBModuleExportWizard">
- <enablement>
- <or>
- <and>
- <or>
- <objectClass
- name="org.eclipse.wst.common.navigator.internal.groups.NavigatorGroup">
- </objectClass>
- <objectClass
- name="org.eclipse.core.resources.IProject">
- </objectClass>
- </or>
- <or>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.ejb.EJBNature">
- </objectState>
- </or>
- </and>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.ejb.impl.EJBJarImpl">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.ejb.provider.GroupedEJBItemProvider">
- </objectClass>
- </or>
- </enablement>
- </commonWizard> -->
- <!-- Import Classes Wizard -->
- <!-- <commonWizard
- type="import"
- wizardId="org.eclipse.jst.j2ee.internal.wizard.ClassesImportWizard">
- <enablement>
- <or>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.ejb.impl.EJBJarImpl">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.ejb.provider.GroupedEJBItemProvider">
- </objectClass>
- </or>
- </enablement>
- </commonWizard> -->
- </extension>
-
- <extension point="org.eclipse.wst.common.project.facet.ui.wizard">
-
- <wizard-pages facet="jst.ejb" version="1.1">
- <install>
- <page class="org.eclipse.jst.ejb.ui.project.facet.EjbFacetInstallPage"/>
- </install>
- </wizard-pages>
-
- <wizard-pages facet="jst.ejb" version="2.0">
- <install>
- <page class="org.eclipse.jst.ejb.ui.project.facet.EjbFacetInstallPage"/>
- </install>
- </wizard-pages>
-
- <wizard-pages facet="jst.ejb" version="2.1">
- <install>
- <page class="org.eclipse.jst.ejb.ui.project.facet.EjbFacetInstallPage"/>
- </install>
- </wizard-pages>
-
- </extension>
-</plugin>
diff --git a/plugins/org.eclipse.jst.ejb.ui/prepareforpii.xml b/plugins/org.eclipse.jst.ejb.ui/prepareforpii.xml
deleted file mode 100644
index 997f197..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/prepareforpii.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<project name="PrepareForPII" default="main" basedir=".">
-
- <!-- Setup temp variables -->
- <target name="init">
- <property name="nlsDir" value="d:/NLS/Corona/0526"/>
- <property name="plugin" value="com.ibm.wtp.ejb.ui"/>
- <property name="plugindir" value="d:/workspaceCorona/${plugin}"/>
- <property name="outputDir" value="${nlsDir}/${plugin}"/>
-
-
- </target>
-
- <!-- Create the destination dir -->
- <target name="nlsDir" depends="init">
- <mkdir dir="${nlsDir}"/>
- </target>
-
- <!-- Create the destination dir -->
- <target name="plugindir" depends="nlsDir">
- <delete dir="${outputDir}"/>
- <mkdir dir="${outputDir}"/>
- </target>
-
- <!-- Move the files to the correct locations in the workspace. -->
- <target name="main" depends="plugindir">
-
- <messageIdGen folderPath = "${plugindir}" componentId = "E" />
-
- <copy file="${plugindir}/plugin.properties" todir="${outputDir}"/>
-
- </target>
-</project>
diff --git a/plugins/org.eclipse.jst.ejb.ui/property_files/ejb_ui.properties b/plugins/org.eclipse.jst.ejb.ui/property_files/ejb_ui.properties
deleted file mode 100644
index 7e10408..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/property_files/ejb_ui.properties
+++ /dev/null
@@ -1,44 +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
-###############################################################################
-KEY_0=Failed to find the image "{0}".
-KEY_1=New EJB Project
-KEY_2=EJB version:
-KEY_3=EJB Project
-KEY_4=Create an EJB Project and add it to a new or existing Enterprise Application.
-KEY_5=Import an EJB jar from the file system
-KEY_6=EJB Jar Import
-KEY_7=EJB Jar file:
-KEY_8=EJB Project:
-KEY_9=EJB Jar Export
-KEY_10=Export EJB project to the local file system.
-KEY_11=EJB client JAR Creation
-KEY_12=Use this wizard to create an EJB client JAR from your existing EJB
-KEY_13=Client JAR URI:
-KEY_14=Project name:
-KEY_15=Project location:
-KEY_16=EJB Project:
-KEY_17=Delete Bean Only
-KEY_18=Delete Bean Classes
-KEY_19=Delete Access Bean
-KEY_20=Delete Deployed Code
-KEY_21=Select All
-KEY_22=Deselect All
-KEY_23=The selected enterprise bean cannot be deleted because it is involved in\nrelationships with other enterprise beans. You must first delete these\nrelationships before deleting the bean.
-KEY_24=Delete...
-KEY_25=Cannot delete Enterprise Bean
-KEY_26=Cannot delete the bean named "{0}" because it is in a binary project.
-KEY_27=Delete Enterprise Bean(s)
-KEY_28=What options would you like when deleting the selected\nEnterprise Bean(s)?
-GroupedEJBJarItemProvider_UI_0=Session
-GroupedEJBJarItemProvider_UI_1=Entity
-GroupedEJBJarItemProvider_UI_2=Message
-NewEJBModuleAction_UI_0=EJB Project
-
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 cb01053..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"/>
- <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 0f8d74a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-temp.folder
-*.jar
-build.xml
-@dot
-src.zip
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/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/META-INF/MANIFEST.MF
deleted file mode 100644
index 024b066..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,30 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: EJB Annotation Model Plug-in
-Bundle-SymbolicName: org.eclipse.jst.j2ee.ejb.annotation.model; singleton:=true
-Bundle-Version: 1.0.0
-Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.jst.j2ee.ejb.annotation.internal.model.ModelPlugin
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package:
- org.eclipse.jst.j2ee.ejb.annotation.internal.messages,
- org.eclipse.jst.j2ee.ejb.annotation.internal.model,
- org.eclipse.jst.j2ee.ejb.annotation.internal.operations,
- org.eclipse.jst.j2ee.ejb.annotation.internal.preferences,
- org.eclipse.jst.j2ee.ejb.annotation.internal.provider,
- org.eclipse.jst.j2ee.ejb.annotation.internal.utility
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.jdt.core,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.common.frameworks.ui,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jst.j2ee.ejb,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.jem,
- org.eclipse.wst.common.modulecore,
- org.eclipse.jst.common.frameworks,
- org.eclipse.core.commands
-Eclipse-AutoStart: true
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 6f6b96c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/build.properties b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/build.properties
deleted file mode 100644
index 5a41439..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = plugin.xml,\
- .,\
- META-INF/,\
- about.html
-src.includes = schema/
-source.. = src/
-
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 447e86e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/messages/EJBAnnotationMessages.java
+++ /dev/null
@@ -1,152 +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_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 5b73dfe..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/messages/IEJBAnnotationConstants.java
+++ /dev/null
@@ -1,134 +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_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 e8e4416..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/CMPAttributeDelegate.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.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;
-
- public CMPAttributeDelegate() {
- this.name = "aField";
- this.attributeType = "java.lang.String";
- this.jdbcType = "VARCHAR";
- this.sqlType = "VARCHAR";
- this.columnName = "ACOLUMN";
- }
-
- /**
- * @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;
- }
-
- /**
- * @param sqlType
- * The sqlType to set.
- */
- public void setSqlType(String sqlType) {
- this.sqlType = sqlType;
- }
-}
\ 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 60a91a3..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/ContainerManagedEntityBeanDataModelProvider.java
+++ /dev/null
@@ -1,200 +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.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.FALSE;
- 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 "MYSCHEMA";
- 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));
- }
-}
\ 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 65a0672..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/ContainerManagedEntityBeanDelegate.java
+++ /dev/null
@@ -1,129 +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);
- }
-
- 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 fc30747..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.application.internal.operations.IAnnotationsDataModel;
-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);
- else 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 "A session bean 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);
- }
- }
- }
- } 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();
-
-}
\ 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/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 2462af7..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/MessageDrivenBeanDataModelProvider.java
+++ /dev/null
@@ -1,124 +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.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));
- this.setProperty(DESTINATIONNAME, this.getProperty(DESTINATIONNAME));
- }
-
-
-
-}
\ 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 1c7c3c2..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((String) 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 5306a9f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/SessionBeanDataModelProvider.java
+++ /dev/null
@@ -1,113 +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(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 fa845dc..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/utility/AnnotationUtilities.java
+++ /dev/null
@@ -1,102 +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().getNamespace();
-
- 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().getNamespace();
-
- 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 fb6f464..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/web_ui.properties
+++ /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
-###############################################################################
-_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=Create from table
-CMP_FROM_BEAN=Create from JavaBean
-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_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.ui/.classpath b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/.cvsignore b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/.cvsignore
deleted file mode 100644
index 6318ad2..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-temp.folder
-build.xml
-ejbAnnotationsUi.jar
-@dot
-src.zip
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/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 51f9a07..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,41 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: EJB Annotations Ui Plug-in
-Bundle-SymbolicName: org.eclipse.jst.j2ee.ejb.annotations.ui; singleton:=true
-Bundle-Version: 1.0.0
-Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.jst.j2ee.ejb.annotation.ui.internal.EjbAnnotationsUiPlugin
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.j2ee.ejb.annotation.ui.internal,
- org.eclipse.jst.j2ee.ejb.annotation.ui.internal.preferences,
- org.eclipse.jst.j2ee.ejb.annotation.ui.internal.wizards
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.common.frameworks.ui,
- org.eclipse.wst.common.navigator.workbench,
- org.eclipse.ui,
- org.eclipse.ui.workbench,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jst.j2ee.ui,
- org.eclipse.jst.j2ee.ejb,
- org.eclipse.jst.j2ee.ejb.annotation.model,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.wst.common.modulecore,
- org.eclipse.jst.ejb.ui,
- org.eclipse.jem.util,
- org.eclipse.jst.common.frameworks,
- org.eclipse.jdt.core,
- org.eclipse.wst.web.ui,
- org.eclipse.wst.common.project.facet.ui,
- org.eclipse.wst.rdb.connection.ui,
- org.eclipse.wst.rdb.core,
- org.eclipse.wst.rdb.core.ui,
- org.eclipse.wst.rdb.data.core,
- org.eclipse.wst.rdb.data.ui,
- org.eclipse.wst.rdb.server.ui,
- org.eclipse.jdt.ui,
- org.eclipse.jface.text
-Eclipse-AutoStart: true
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 6f6b96c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.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 cd550f7..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/plugin.properties
+++ /dev/null
@@ -1,5 +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
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 8fe1cc6..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/plugin.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-
-<!--================================-->
-<!-- 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"
- class="org.eclipse.jst.j2ee.ejb.annotation.ui.internal.wizards.AddEjbWizard"
- id="org.eclipse.jst.j2ee.ejb.annotation.ui.internal.wizards.AddEjbWizard">
- <description>
- %new.ejb.description_ui_
- </description>
- </wizard>
- </extension>
-
- <extension
- point="org.eclipse.wst.common.navigator.workbench.commonWizard">
- <commonWizard
- type="new"
- wizardId="org.eclipse.jst.j2ee.ejb.annotation.ui.internal.wizards.AddEjbWizard">
- <enablement>
- <or>
- <and>
- <objectClass
- name="org.eclipse.core.resources.IProject">
- </objectClass>
- <objectState
- name="projectNature"
- value="org.eclipse.jdt.core.javanature">
- </objectState>
- </and>
- </or>
- </enablement>
- </commonWizard>
- </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/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 31a0025..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/EjbAnnotationsUiPlugin.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.ui.internal;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-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;
- }
-}
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 61b8145..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,205 +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.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.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.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.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 jndiNameText;
- 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);
- }
-
- 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.DATASOURCE_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, IContainerManagedEntityBeanDataModelProperties.DATASOURCE, null);
-
- // jndi name
- 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);
-
- ejbNameText.addModifyListener(new ModifyListener()
- {
-
- public void modifyText(ModifyEvent e) {
- jndiNameText.setText(ejbNameText.getText());
- displayNameText.setText(ejbNameText.getText());
- descText.setText("An Entity bean named "+ejbNameText.getText());
-
- }
-
- });
- }
-
- 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 34ca6e2..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,178 +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.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.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.project.J2EEProjectUtilities;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.IDMPageHandler;
-import org.eclipse.wst.rdb.internal.core.connection.ConnectionInfo;
-
-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());
- }
- }
-
- protected IDataModelProvider getDefaultProvider() {
- return new ContainerManagedEntityBeanDataModelProvider();
- }
-
- /*
- * (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);
-
- 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);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.wtp.common.ui.wizard.WTPWizard#runForked()
- */
- protected boolean runForked() {
- return true;
- }
-
- public ConnectionInfo 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 b56dab8..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,152 +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";
- }
-}
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 0e5773f..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,631 +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.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-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;
-import org.eclipse.wst.rdb.internal.core.connection.ConnectionInfo;
-
-public class ChooseTableWizardPage extends DataModelWizardPage {
-
- protected final Image fChecked = EjbAnnotationsUiPlugin.getDefault().getImageDescriptor("icons/checked.gif").createImage();// Util.createImage("icons/checked.gif",getClass());
- protected final Image fUnchecked = EjbAnnotationsUiPlugin.getDefault().getImageDescriptor("icons/unchecked.gif").createImage();// Util.createImage("icons/unchecked.gif",
-
- 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() {
- return (List) this.getDataModel().getProperty(IContainerManagedEntityBeanDataModelProperties.ATTRIBUTES);
- }
-
- 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) {
- 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 {
- ConnectionInfo connectionInfo = getConnectionInfo();
- if (connectionInfo == null)
- return;
- String passw = connectionInfo.getPassword();
- if (passw == null || passw.length() == 0)
- passw = "password";
- connectionInfo.setPassword(passw);
-
- connection = connectionInfo.connect();
-
- if (connection == null)
- return;
- 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()) {
- CMPAttributeDelegate atr = new CMPAttributeDelegate();
- atr.setName(columns.getString("COLUMN_NAME"));
- 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"));
- 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.getName()))
- 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 {
- ConnectionInfo connectionInfo = getConnectionInfo();
- if (connectionInfo == null)
- return;
- String passw = connectionInfo.getPassword();
- if (passw == null || passw.length() == 0)
- passw = "password";
- connectionInfo.setPassword(passw);
-
- connection = connectionInfo.connect();
-
- if (connection == null)
- return;
- 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 (connection != 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 ConnectionInfo 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);
-
- column = new TableColumn(attributeTable, SWT.CENTER, 5);
- column.setText(IEJBAnnotationConstants.ATTRIBUTE_READONLY);
- column.setWidth(80);
-
- column = new TableColumn(attributeTable, SWT.CENTER, 6);
- 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.getName());
- 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);
-
- editors[5] = new CheckboxCellEditor(table, SWT.CENTER);
-
- editors[6] = 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_JDBCTYPE,
- IEJBAnnotationConstants.ATTRIBUTE_SQLTYPE, 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: // Local
- return "";
- case 6: // 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 5: // Local
- if (fieldMapping.isReadOnly())
- return fChecked;
- else
- return fUnchecked;
-
- case 6: // Local
- if (fieldMapping.isKey())
- return fChecked;
- else
- return fUnchecked;
- case 7: // 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) {
- 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:
- return Boolean.valueOf(fieldMapping.isReadOnly());
- case 6:
- return Boolean.valueOf(fieldMapping.isKey());
- case 7:
- 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()]);
- break;
- case 4:
- fieldMapping.setSqlType(sqlTypes[((Integer) value).intValue()]);
- break;
- case 5:
- boolean readValue = ((Boolean) value).booleanValue();
- fieldMapping.setReadOnly(readValue);
- break;
- case 6:
- boolean newValue = ((Boolean) value).booleanValue();
- fieldMapping.setKey(newValue);
- break;
- case 7:
- 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 0dc608d..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,391 +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.SQLException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.messages.IEJBAnnotationConstants;
-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.PlatformUI;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-import org.eclipse.wst.rdb.connection.internal.ui.util.resource.ResourceLoader;
-import org.eclipse.wst.rdb.connection.internal.ui.wizards.ConnectionDisplayProperty;
-import org.eclipse.wst.rdb.connection.internal.ui.wizards.shared.UserIdentification;
-import org.eclipse.wst.rdb.internal.core.RDBCorePlugin;
-import org.eclipse.wst.rdb.internal.core.connection.ConnectionInfo;
-import org.eclipse.wst.rdb.server.internal.ui.wizards.NewConnectionWizard;
-
-public class ConnectionSelectionPage extends DataModelWizardPage implements SelectionListener {
-
- private static final ResourceLoader resourceLoader = ResourceLoader.INSTANCE;
- 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);
- return composite;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
- */
-
- public void handleEvent(Event event) {
- Widget source = event.widget;
- if (source == newConnectionButton) {
- ConnectionInfo[] infos = RDBCorePlugin.getDefault().getConnectionManager().getAllNamedConnectionInfo();
- java.util.List nameList = new ArrayList(infos.length);
- for (int i = 0, n = infos.length; i < n; i++) {
- if (!nameList.contains(infos[i].getName())) {
- nameList.add(infos[i].getName().toLowerCase());
- }
- }
- String[] names = (String[]) nameList.toArray(new String[nameList.size()]);
-
- NewConnectionWizard wizard = new NewConnectionWizard(null, true);
- wizard.init(PlatformUI.getWorkbench(), null);
- wizard.setNeedsProgressMonitor(false);
- wizard.setExistingConnectionNames(Arrays.asList(names));
- 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(resourceLoader.queryString("CUI_CONN_SELECT_EXT_RECONNECT_BTN_LBL")); //$NON-NLS-1$
- 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) {
- ConnectionInfo info = getSelectedConnection();
- UserIdentification userDialog = new UserIdentification(info.getUserName());
- 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().setPassword(pa);
- this.getSelectedConnection().setUserName(us);
- this.getSelectedConnection().connect();
- reconnectButton.setEnabled(false);
- connected = true;
- } catch (Exception ex) {
- reconnectButton.setEnabled(true);
- connected = false;
- MessageDialog.openError(this.getShell(), resourceLoader.queryString("CUI_CONN_SELECT_EXT_ERROR_DIALOG_TITLE"), //$NON-NLS-1$
- ex.getMessage());
- }
- isValidConnection();
- }
- }
- }
-
- private void initializeValues() {
- existingConnectionsList.removeAll();
- ConnectionInfo[] connInfos = getConnectionsToDisplay();
- if (connInfos != null) {
- existingConnections = new Hashtable();
- java.util.List sortedConnections = Arrays.asList(connInfos);
- sortConnections(sortedConnections);
- Iterator connections = sortedConnections.iterator();
- while (connections.hasNext()) {
- ConnectionInfo con = (ConnectionInfo) 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 = ((ConnectionInfo) o1).getName();
- String s2 = ((ConnectionInfo) 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 ConnectionInfo getSelectedConnection() {
- if (existingConnections == null || existingConnectionsList == null || existingConnectionsList.getSelection().length == 0)
- return null;
- ConnectionInfo connection = (ConnectionInfo) 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 ConnectionInfo[] getConnectionsToDisplay() {
- return RDBCorePlugin.getDefault().getConnectionManager().getAllNamedConnectionInfo();
- }
-
- /**
- * Refreshes this page
- */
- public void refresh() {
- reconnectButton.setEnabled(true);
- connected = false;
- initializeValues();
- isValidConnection();
- }
-
- private void updateConnectionProperties() {
- connectionPropertiesTable.removeAll();
- if (existingConnectionsList.getSelectionIndex() > -1) {
- ConnectionInfo selectedConnection = (ConnectionInfo) existingConnections.get((String) existingConnectionsList
- .getSelection()[0]);
- if (selectedConnection != null) {
-
- ConnectionDisplayProperty[] properties = getConnectionDisplayProperties(selectedConnection);
- if (properties != null) {
- int propertyCount = properties.length;
- for (int index = 0; index < propertyCount; index++) {
- TableItem tableItem = new TableItem(connectionPropertiesTable, SWT.NONE);
- tableItem.setText(new String[] { properties[index].getPropertyName(), properties[index].getValue() });
- }
- }
- }
- }
- }
-
- private ConnectionDisplayProperty[] getConnectionDisplayProperties(ConnectionInfo connectionInfo) {
- ConnectionDisplayProperty[] properties = null;
- Vector propertiesCollection = new Vector();
-
- propertiesCollection.add(new ConnectionDisplayProperty(resourceLoader
- .queryString("_UI_JDBC_DRIVER_CLASS_CONNECTION_PROPERTY_NAME"), connectionInfo.getDriverClassName())); //$NON-NLS-1$
- propertiesCollection.add(new ConnectionDisplayProperty(resourceLoader
- .queryString("_UI_CLASS_LOCATION_CONNECTION_PROPERTY_NAME"), connectionInfo.getLoadingPath())); //$NON-NLS-1$
- propertiesCollection.add(new ConnectionDisplayProperty(
- resourceLoader.queryString("_UI_URL_CONNECTION_PROPERTY_NAME"), connectionInfo.getURL())); //$NON-NLS-1$
- propertiesCollection.add(new ConnectionDisplayProperty(
- resourceLoader.queryString("_UI_USER_ID_CONNECTION_PROPERTY_NAME"), connectionInfo.getUserName())); //$NON-NLS-1$
-
- properties = new ConnectionDisplayProperty[propertiesCollection.size()];
- propertiesCollection.copyInto(properties);
-
- return properties;
- }
-
- protected String[] getValidationPropertyNames() {
- return null;
- }
-
- public boolean isPageComplete() {
- return connected;
- // return this.isValidConnection();
- }
-
- protected boolean isValidConnection() {
- Connection connection = null;
- try {
- ConnectionInfo connectionInfo = this.getSelectedConnection();
- if (connectionInfo != null) {
- connection = this.getSelectedConnection().connect();
- }
- } catch (Throwable e) {
- } finally {
- try {
- if (connection != null) {
- connection.close();
- } else {
- this.setErrorMessage(IEJBAnnotationConstants.ERR_CMP_NO_CONNECTION);
- connected = false;
- this.setPageComplete(false);
- return false;
- }
- } catch (SQLException e) {
- }
- }
- this.setErrorMessage(null);
- setMessage(IEJBAnnotationConstants.ERR_CMP_CONNECTION_SUCCESS, IStatus.OK);
- connected = true;
- this.setPageComplete(true);
- return true;
- }
-
-}
\ 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 6fb6a21..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,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.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;
- }
-
-
-}
\ 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 b1d1409..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,195 +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.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.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);
-
- ejbNameText.addModifyListener(new ModifyListener()
- {
-
- public void modifyText(ModifyEvent e) {
- jndiNameText.setText(ejbNameText.getText());
- displayNameText.setText(ejbNameText.getText());
- descText.setText("A MessageDriven bean named "+ejbNameText.getText());
-
- }
-
- });
- }
-
- 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 60db999..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,104 +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.MessageDrivenBeanDataModelProvider;
-import org.eclipse.jst.j2ee.ejb.annotation.ui.internal.EjbAnnotationsUiPlugin;
-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.IDataModel;
-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());
- }
- }
-
- protected IDataModelProvider getDefaultProvider() {
- return new MessageDrivenBeanDataModelProvider();
- }
-
- /*
- * (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 817a549..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,197 +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.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.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.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);
- }
-
- 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);
-
- ejbNameText.addModifyListener(new ModifyListener()
- {
-
- public void modifyText(ModifyEvent e) {
- jndiNameText.setText(ejbNameText.getText());
- displayNameText.setText(ejbNameText.getText());
- descText.setText("A session bean named "+ejbNameText.getText());
-
- }
-
- });
- }
-
- 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 a90c619..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,134 +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 ){
- dataModel.setProperty(IEnterpriseBeanClassDataModelProperties.EJB_NAME,className);
- dataModel.setProperty(IEnterpriseBeanClassDataModelProperties.JNDI_NAME,className);
- dataModel.setProperty(IEnterpriseBeanClassDataModelProperties.DISPLAY_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 5e634cc..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,250 +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.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.Label;
-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);
- 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("SessionBean"); //$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("MessageDrivenBean"); //$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("ContainerManagedEntityBean"); //$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) {
-
- Link link = new Link(composite, SWT.NONE);
- link.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false, 3, 1));
- link.setText("You can change your provider <a>preferences</a>");
-
- 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();
- IPreferenceNode node = manager.find("org.eclipse.jst.j2ee.ejb.annotations.xdoclet.preference");
- 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];
- }
-
- 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("Annotation provider definition is not valid, please check the preferences. ");
- 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 f11b174..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.ejb.annotation.ui."; //$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/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 0a275b1..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,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.annotation.ui.internal.wizards;
-
-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;
-
-
-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);
- }
- }
-
-}
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 221f9ab..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,77 +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.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) {
- 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.xdoclet/.classpath b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/.classpath
deleted file mode 100644
index 751c8f2..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"/>
- <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 cd0342b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-temp.folder
-build.xml
-xdocletAnnotation.jar
-@dot
-src.zip
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/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/META-INF/MANIFEST.MF
deleted file mode 100644
index bcb8daf..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,44 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Xdoclet Annotations Plug-in
-Bundle-SymbolicName: org.eclipse.jst.j2ee.ejb.annotations.xdoclet; singleton:=true
-Bundle-Version: 1.0.0
-Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletAnnotationPlugin
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet,
- org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.provider,
- org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.ui
-Require-Bundle: org.eclipse.jst.j2ee.ejb.annotations.emitter;visibility:=reexport,
- org.eclipse.jdt,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore,
- org.eclipse.jdt.core,
- org.eclipse.jst.j2ee.core,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.ui,
- org.eclipse.jdt.launching,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.ejb,
- org.eclipse.wst.common.emfworkbench.integration,
- org.eclipse.jst.j2ee.web,
- org.eclipse.wst.common.modulecore,
- org.eclipse.jem.workbench,
- org.eclipse.jem.util,
- org.eclipse.jst.common.annotations.controller,
- org.eclipse.jst.j2ee.ejb.annotation.model,
- org.eclipse.jst.common.frameworks,
- org.eclipse.wst.common.frameworks,
- org.eclipse.ant.core,
- org.eclipse.debug.core,
- org.eclipse.ant.ui,
- org.eclipse.debug.ui,
- org.eclipse.jdt.debug.ui,
- org.eclipse.jem,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.jst.common.project.facet.core,
- org.eclipse.wst.common.project.facet.ui
-Eclipse-AutoStart: true
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 6f6b96c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/build.properties b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/build.properties
deleted file mode 100644
index 62a4c36..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/build.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-bin.includes = plugin.xml,\
- .,\
- ejb-merge.xml,\
- templates/,\
- META-INF/,\
- about.html,\
- plugin.properties,\
- schema/,\
- icons/
-src.includes = build.properties,\
- schema/,\
- templates/
-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 b3dbcce..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/plugin.properties
+++ /dev/null
@@ -1,15 +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
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 d8b9d8e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/plugin.xml
+++ /dev/null
@@ -1,787 +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.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
- objectClass="org.eclipse.jdt.core.IJavaProject"
- name="%XDocletPropertiesPage.name"
- class="org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.ui.XDocletPreferencePage"
- id="XDocletPropertiesPage">
- <filter
- name="nature"
- value="org.eclipse.wst.common.modulecore.ModuleCoreNature">
- </filter>
- </page>
-
-<!-- =========== org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.ui.XDocletEJBPreferencePage ============ -->
-
- <page
- objectClass="org.eclipse.jdt.core.IJavaProject"
- 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.modulecore.ModuleCoreNature">
- </filter>
- </page>
-
-<!-- =========== org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.ui.XDocletWebPreferencePage ============ -->
-
- <page
- objectClass="org.eclipse.jdt.core.IJavaProject"
- 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.modulecore.ModuleCoreNature">
- </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"/>
- <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"/>
- </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>
-
- <action 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"/>
- </action>
- <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>Dynamic Web Project with XDoclet</label>
- <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"/>
- </and>
- </constraint>
- </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"/>
- </and>
- </constraint>
- </project-facet-version>
-
- <project-facet-version facet="jst.ejb.xdoclet" version="1.2.3">
- <constraint>
- <and>
- <requires facet="jst.ejb" version=">=1.1"/>
- </and>
- </constraint>
- </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>
- <action 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"/>
- </action>
- <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>EJB Project with XDoclet</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>
-
-</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 587b1fd..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/schema/ejbDocletTaskProvider.exsd
+++ /dev/null
@@ -1,249 +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"/>
- </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>
-
- <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 86378fd..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/ClasspathProvider.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.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() {
- return super.getClasspathItems();
- }
-}
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 bb94700..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletAntProjectBuilder.java
+++ /dev/null
@@ -1,216 +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.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;
- }
-
- /**
- * @param resource
- * @param monitor
- */
- public void buildUsingAnt(IResource beanClass, IProgressMonitor monitor) {
- initPreferenceStore(beanClass.getProject());
- IJavaProject javaProject = JavaCore.create(beanClass.getProject());
- try {
- IPackageFragmentRoot packageFragmentRoot = getPackageFragmentRootOrFirst(beanClass);
- String beanPath = constructAnnotatedClassList(packageFragmentRoot,beanClass);
-
- Properties properties = createAntBuildProperties(beanClass,
- javaProject, packageFragmentRoot, beanPath);
- this.setProperties(properties);
- HashMap templates = createTemplates(beanPath);
-
- AntLauncherUtility antLauncher = new AntLauncherUtility(templateUrl, beanClass
- .getParent().getLocation(), properties, templates);
- antLauncher.setUseLauncher(true);
- antLauncher.launch(getTaskName(), monitor);
- this.refreshProjects(beanClass.getProject(), monitor);
- } catch (Exception e) {
- Logger.logException(e);
- }
- }
-
- 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 2f50501..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletBuildUtility.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.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.FULL_BUILD,
- XDOCLETBUILDER, xdocletBuilder.getArguments(), 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 73c6806..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletBuilder.java
+++ /dev/null
@@ -1,372 +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;
-
-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);
- Platform.getJobManager().beginRule(validateEditRule, monitor);
- status = workspace.validateEdit(validateFiles, null);
- } finally {
- if (validateEditRule != null) {
- Platform.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()) {
- 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) {
- if (!monitor.isCanceled() && resource.getType() == IResource.FILE) {
- 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
- }
-}
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 f4df81a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletEjbAntProjectBuilder.java
+++ /dev/null
@@ -1,288 +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.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-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().getNamespace();
-
- 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);
-
- properties.put("ejb", resource.getProject().getName()); //$NON-NLS-1$
- properties.put("ejb.project.dir", resource.getProject().getLocation().toString()); //$NON-NLS-1$
- properties.put("ejb.project.classpath", asClassPath(javaProject)); //$NON-NLS-1$
- properties.put("ejb.module.src", packageFragmentRoot.getResource().getProjectRelativePath().toString()); //$NON-NLS-1$
- properties.put("ejb.module.gen", packageFragmentRoot.getResource().getProjectRelativePath().toString()); //$NON-NLS-1$
- properties.put("ejb.bin.dir", this.getJavaProjectOutputContainer(javaProject).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 = Platform.asLocalURL(url);
- File file = new File(url.getFile());
- properties.put("ant.home", file.getAbsolutePath()); //$NON-NLS-1$
- WorkbenchComponent ejbModule = null;
- ComponentResource[] moduleResources = core.findResourcesBySourcePath(resource.getProjectRelativePath());
- for (int i = 0; i < moduleResources.length; i++) {
- ComponentResource moduleResource = moduleResources[i];
- if (moduleResource != null)
- ejbModule = moduleResource.getComponent();
- if (ejbModule != null)
- break;
- }
-
- // 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();
- if (ejbModule == null) {
- ejbModule = core.getComponent();
- }
-
- ejbEdit = EJBArtifactEdit.getEJBArtifactEditForRead(proj);
-
- int ejbLevelI = ejbEdit.getEJBJarXmiResource().getModuleVersionID();
- 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);
- properties.put("ejb.spec.version", ejbLevel); //$NON-NLS-1$
- 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);
-
- }
-
-}
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 f510b7d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletExtensionUtil.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.annotations.internal.xdoclet;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.Platform;
-
-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()]);
- }
-}
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 2922016..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletPreferenceStore.java
+++ /dev/null
@@ -1,166 +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.io.IOException;
-
-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.IPreferencesService;
-import org.eclipse.core.runtime.preferences.IScopeContext;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ui.preferences.ScopedPreferenceStore;
-
-public final class XDocletPreferenceStore {
-
- private static IPreferencesService preferencesService = null;
-
- private ScopedPreferenceStore projectSettings;
-
- private IProject project = null;
-
- 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";
-
- public XDocletPreferenceStore(IProject project) {
- this.project = project;
- if (project != null) {
- projectSettings = new ScopedPreferenceStore(new ProjectScope(project), getPreferencePrefix());
- }
-
- }
-
- protected static String getPreferencePrefix() {
- return XDocletAnnotationPlugin.getDefault().getBundle().getSymbolicName();
- }
-
- private IPreferencesService getPreferencesService() {
-
- if (preferencesService == null) {
- preferencesService = Platform.getPreferencesService();
-
- }
- return preferencesService;
- }
-
- private IScopeContext[] getLookupOrder() {
- String key = XDOCLETUSEGLOBAL;
-
- IScopeContext[] projectScopeOrder = null;
- if (project != null)
- projectScopeOrder = new IScopeContext[] { new ProjectScope(project), new InstanceScope(), new DefaultScope() };
- IScopeContext[] globalScopeOrder = new IScopeContext[] { new InstanceScope(), new DefaultScope() };
-
- if (projectScopeOrder == null)
- projectScopeOrder = globalScopeOrder;
-
- boolean useGlobal = this.getPreferencesService().getBoolean(getPreferencePrefix(), key, false, projectScopeOrder);
-
- if (useGlobal || project == null)
- return globalScopeOrder;
- else
- return projectScopeOrder;
- }
-
- public void setProperty(String item, String value) {
- IPreferenceStore store = XDocletAnnotationPlugin.getDefault().getPreferenceStore();
- if (project != null)
- store = projectSettings;
-
- store.setValue(item, value);
- }
-
- public void save() {
- try {
- if (project != null && projectSettings != null)
- projectSettings.save();
- } catch (IOException e) {
- Logger.logException(e);
- }
-
- }
-
- public void setProperty(String item, boolean value) {
- IPreferenceStore store = XDocletAnnotationPlugin.getDefault().getPreferenceStore();
- if (project != null)
- store = projectSettings;
-
- store.setValue(item, value);
-
- }
-
- public String getProperty(String item) {
- IScopeContext[] lOrder = this.getLookupOrder();
- return this.getPreferencesService().getString(getPreferencePrefix(), item, null, lOrder);
- }
-
- public boolean getBooleanProperty(String item) {
-
- IScopeContext[] lOrder = this.getLookupOrder();
- return this.getPreferencesService().getBoolean(getPreferencePrefix(), item, false, lOrder);
- }
-
- 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];
- 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 b9d9b51..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletRuntime.java
+++ /dev/null
@@ -1,169 +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;
-
-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,
- "Could not find library for version: " + 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,
- "Could not find library: " + jar, 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 d3b79b4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletWebAntProjectBuilder.java
+++ /dev/null
@@ -1,212 +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.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().getNamespace();
-
- 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 = null;
- ComponentResource[] moduleResources = moduleCore.findResourcesBySourcePath(resource.getProjectRelativePath());
- for (int i = 0; i < moduleResources.length; i++) {
- ComponentResource moduleResource = moduleResources[i];
- if (moduleResource != null)
- wbModule = moduleResource.getComponent();
- if (wbModule != null)
- break;
- }
- IProject proj = StructureEdit.getContainingProject(wbModule);
- webEdit = WebArtifactEdit.getWebArtifactEditForRead(proj);
-
- if (webEdit != null) {
- // j2eeVersion = webEdit.getJ2EEVersion();
- if((contextRoot = webEdit.getServerContextRoot()) == null)
- contextRoot = "";//$NON-NLS-1$
- }
- properties.put("web.module.webinf", getWebInfFolder(wbModule).toString()); //$NON-NLS-1$
- properties.put("web", contextRoot); //$NON-NLS-1$
- properties.put("web.project.dir", resource.getProject().getLocation().toString()); //$NON-NLS-1$
- properties.put("web.project.classpath", asClassPath(javaProject)); //$NON-NLS-1$
- properties.put("web.module.src", packageFragmentRoot.getResource().getProjectRelativePath().toString()); //$NON-NLS-1$
- properties.put("web.module.gen", packageFragmentRoot.getResource().getProjectRelativePath().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$
- URL url = Platform.getBundle("org.apache.ant").getEntry("/"); //$NON-NLS-1$ //$NON-NLS-2$
- url = Platform.asLocalURL(url);
- File file = new File(url.getFile());
- properties.put("ant.home", file.getAbsolutePath()); //$NON-NLS-1$
-
- String servletLevel = J2EEProjectUtilities.getJ2EEProjectVersion(proj);
- // if (j2eeVersion == J2EEVersionConstants.J2EE_1_3_ID)
- // servletLevel = J2EEVersionConstants.VERSION_2_3_TEXT;
- // else if (j2eeVersion == J2EEVersionConstants.J2EE_1_4_ID)
- // servletLevel = J2EEVersionConstants.VERSION_2_4_TEXT;
-
- 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/web.xml"));
- if (webXML.length > 0)
- return webXML[0].getSourcePath().removeLastSegments(1);
- 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 a20d2eb..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,30 +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.NullProgressMonitor;
-import org.eclipse.jface.action.IAction;
-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.getProject()) || J2EEProjectUtilities.isDynamicWebProject(project.getProject()))) {
- XDocletAntProjectBuilder builder = XDocletAntProjectBuilder.Factory.newInstance(project.getProject());
- IFile sourceFile = getFirstSourceFile();
-
- builder.buildUsingAnt(sourceFile, new NullProgressMonitor());
- }
- }
-
-}
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 b9bbf39..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.getProject(), null);
- SourceFinder finder = new SourceFinder();
- try {
-
- 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 64dd0e0..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,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.annotations.internal.xdoclet.facet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.JavaCore;
-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.addToBuildSpecBefore(XDocletActionDelegate.BUILDERID, JavaCore.BUILDER_ID, project
- .getProject());
- project.getProject().build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
- }
- } 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 f685ace..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,53 +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 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());
- } 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 54cf60e..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,221 +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 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.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.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.wst.common.frameworks.datamodel.IDataModel;
-
-public class XDocletAnnotationProvider implements IAnnotationProvider, IEJBGenerator {
-
- 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$
-
- IConfigurationElement preferredAnnotation = EmitterUtilities.findEmitter("XDoclet"); //$NON-NLS-1$
-
- try {
- EjbEmitter ejbEmitter = new SessionEjbEmitter(preferredAnnotation);
- ejbEmitter.setMonitor(monitor);
- comment = ejbEmitter.emitTypeComment(delegate);
- 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, "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.setEnterpriseBeanDelegate(delegate);
- 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("");
-
- 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);
- 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.setEnterpriseBeanDelegate(delegate);
- 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.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 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);
- 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.setEnterpriseBeanDelegate(delegate);
- 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.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 {
- EmitterUtilities.addAnnotationBuilderToProject(emitterConfiguration, project);
- }
-
-}
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 2533c06..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,205 +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("Attributes " + tag.getAttribute("name"));
- attributes.setToolTipText(tag.getAttribute("description"));
-
- GridLayout layout = new GridLayout(4, 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 = 1; i < params.length; i++) {
- final IConfigurationElement attribute = params[i];
-
- 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(attributeGroup, attribute);
- String includeId = attribute.getAttribute("id") + ".include";
- Button bool = createLabeledCheck("include", preferenceStore.getBooleanProperty(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("", preferenceStore.getProperty(attribute.getAttribute("id")), parent);
- str.setData(attribute);
- allProperties.put(attribute.getAttribute("id"), str);
- } else if ("boolean".equals(type)) {
- Button bool = createLabeledCheck("", preferenceStore.getBooleanProperty(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("");
-
- 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.getProperty(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 fd8d293..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,38 +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;
-
-
- 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 84f0086..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,237 +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;
- Table table;
- Button edit;
-
- 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("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("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) {
-
- CheckboxTableViewer 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.getBooleanProperty(selection))
- checked.add(extension);
- }
- }
-
- return checked.toArray();
- }
-
- protected static String[] columnNames = { "include", "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();
- }
-}
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 d9f2ad6..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,109 +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 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 438450e..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,234 +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().getBooleanProperty(XDocletPreferenceStore.XDOCLETUSEGLOBAL),
- Messages.label_global_pref, Messages.desc_global_pref, getStore().getBooleanProperty(
- XDocletPreferenceStore.XDOCLETUSEGLOBAL), defPanel);
-
- panel.preferences[0] = panel.createLabeledCheck(0, false, getStore().getBooleanProperty(
- XDocletPreferenceStore.XDOCLETBUILDERACTIVE), Messages.label_enable_xdoclet_builder,
- Messages.desc_enable_xdoclet_builder, getStore().getBooleanProperty(XDocletPreferenceStore.XDOCLETBUILDERACTIVE),
- defPanel);
- panel.preferences[2] = panel.createLabeledPath(2, true, Messages.label_xdoclet_home, Messages.desc_xdoclet_home, getStore()
- .getProperty(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().getProperty(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);
- 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 validateCurrentPreferences(final Text xDocletPath, final Combo xDocletVersion) {
- int selection = xDocletVersion.getSelectionIndex();
- 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 3ea1c3d..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,109 +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 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 a8f4f48..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,11 +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
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 955e7a4..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,254 +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]);
- 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.doSave();
- }
-
- 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 d9a52d0..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/builder/xdoclet.xml
+++ /dev/null
@@ -1,97 +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="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.project.dir}/${ejb.module.gen}"
- mergedir="${ejb.dd.dir}"
- excludedtags="@version,@author,@todo"
- addedtags="@wtp generated"
- ejbspec="${ejb.spec.version}"
- force="${xdoclet.force}"
- verbose="true" >
-
-
-<!-- BEANS START -->
- <fileset dir="${ejb.project.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.project.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"/>
- </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 16d114c..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.project.dir}/${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.project.dir}/${web.module.webinf}"
- mergedir="${web.project.dir}/${web.module.webinf}"
- excludedtags="@version,@author,@todo"
- addedtags="@wtp generated"
- force="${xdoclet.force}"
- verbose="true" >
-
- <!-- SERVLETS START -->
- <fileset dir="${web.project.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 3a4b000..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="TypeStubGenerator" 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 656ce47..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="TypeStubGenerator" 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.getSqlType() %>"
-* 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 479a7a3..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/entity/typeComment.javajet
+++ /dev/null
@@ -1,38 +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.ejb.*"%>
-<% 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() %>"
- * data-source="<%=cmp.getDatasource()%>"
- *
- * @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 019fd02..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/entity/typeStub.javajet
+++ /dev/null
@@ -1,33 +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.*"%>
-<% IContainerManagedEntityBean cmp = (IContainerManagedEntityBean)argument;
- boolean isCMP = true;
-
- String primaryKeyType = cmp.getPrimaryKeyClass();
- List keyAttributes = cmp.getKeyAttributes();
- int pkCount=keyAttributes.size();
- boolean isComposite = keyAttributes.size() > 1;
-
-%>
-public abstract class <%= cmp.getSimpleClassName()%> 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 dee84ba..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/message/fields.javajet
+++ /dev/null
@@ -1,11 +0,0 @@
-<%@ jet package="org.eclipse.gmf.templates.messageDriven" class="FieldGenerator" imports="java.util.* org.eclipse.jst.j2ee.ejb.annotation.internal.model.*"%>
-<% IMessageDrivenBean mdb = (IMessageDrivenBean)argument; %>
-
-/**
-* <!-- 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 93bdd6c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/message/methodStubs.javajet
+++ /dev/null
@@ -1,65 +0,0 @@
-<%@ jet package="org.eclipse.jst.j2ee.ejb.gmf.templates.messageDriven" class="MethodGenerator" imports="java.util.* org.eclipse.jst.j2ee.ejb.annotation.internal.model.*"%>
-
-<% IMessageDrivenBean mdb = (IMessageDrivenBean)argument; %>
-
-
-/**
- * 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 f9cd4f8..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="java.util.* 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 de99908..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/message/typeStub.javajet
+++ /dev/null
@@ -1,6 +0,0 @@
-<%@ jet package="org.eclipse.gmf.templates.messageDriven" class="TypeStubGenerator" imports="java.util.* org.eclipse.jst.j2ee.ejb.annotation.internal.model.*"%>
-<% IMessageDrivenBean mdb = (IMessageDrivenBean)argument; %>
-
-public class <%= mdb.getSimpleClassName()%> 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 723fcc3..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/session/fields.javajet
+++ /dev/null
@@ -1,9 +0,0 @@
-<%@ jet package="org.eclipse.jst.j2ee.ejb.gmf.templates.session" class="FieldGenerator" imports="java.util.* org.eclipse.jst.j2ee.ejb.annotation.internal.model.*"%>
-<% ISessionBean session = (ISessionBean)argument;
-%>
-/**
- * <!-- begin-xdoclet-definition -->
- * <!-- end-xdoclet-definition -->
- * @generated
- */
-
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 fa74946..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/session/methodStubs.javajet
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ jet package="org.eclipse.jst.j2ee.ejb.gmf.templates.session" class="MethodGenerator" imports="java.util.* org.eclipse.jst.j2ee.ejb.annotation.internal.model.*"%>
-<% ISessionBean session = (ISessionBean)argument; %>
-
-/**
- *
- * <!-- 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 208e53e..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="java.util.* 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 7aa2d1e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/session/typeStub.javajet
+++ /dev/null
@@ -1,7 +0,0 @@
-<%@ jet package="org.eclipse.jst.j2ee.ejb.gmf.templates.session" class="TypeStubGenerator" imports="java.util.* org.eclipse.jst.j2ee.ejb.annotation.internal.model.*"%>
-<% ISessionBean session = (ISessionBean)argument; %>
-
-
-public abstract class <%= session.getSimpleClassName()%> 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 0ddaa47..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"/>
- <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 c57b639..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-runtime
-temp.folder
-build.xml
-@dot
-src.zip
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/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.ejb/META-INF/MANIFEST.MF
deleted file mode 100644
index d977ea5..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,47 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: EJB component Plug-in
-Bundle-SymbolicName: org.eclipse.jst.j2ee.ejb; singleton:=true
-Bundle-Version: 1.0.0
-Bundle-Activator: org.eclipse.jst.j2ee.ejb.internal.plugin.EjbPlugin
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: .,
- org.eclipse.jst.j2ee.ejb.componentcore.util,
- org.eclipse.jst.j2ee.ejb.datamodel.properties,
- org.eclipse.jst.j2ee.ejb.internal.deployables,
- org.eclipse.jst.j2ee.ejb.internal.extensions,
- org.eclipse.jst.j2ee.ejb.internal.modulecore.util,
- org.eclipse.jst.j2ee.ejb.internal.plugin,
- org.eclipse.jst.j2ee.ejb.project.facet,
- org.eclipse.jst.j2ee.internal.ejb.archiveoperations,
- org.eclipse.jst.j2ee.internal.ejb.project,
- org.eclipse.jst.j2ee.internal.ejb.project.operations,
- org.eclipse.jst.j2ee.internal.ejb.provider,
- org.eclipse.jst.j2ee.internal.ejb.refactor,
- org.eclipse.jst.j2ee.internal.ejb.workbench.validation
-Require-Bundle: org.eclipse.jst.j2ee,
- org.eclipse.core.commands,
- org.eclipse.wst.common.frameworks,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.jem.workbench,
- org.eclipse.wst.common.emfworkbench.integration,
- org.eclipse.core.resources,
- org.eclipse.jst.j2ee.core,
- org.eclipse.wst.validation,
- org.eclipse.wst.common.emf,
- org.eclipse.jem,
- org.eclipse.jem.workbench,
- org.eclipse.emf.ecore.edit,
- org.eclipse.core.runtime,
- org.eclipse.jdt.core,
- org.eclipse.wst.server.core,
- org.eclipse.jst.server.core,
- org.eclipse.emf.ecore,
- org.eclipse.jst.common.frameworks,
- org.eclipse.wst.common.modulecore,
- org.eclipse.jem.util,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.jst.common.project.facet.core,
- org.eclipse.wst.web
-Eclipse-AutoStart: true
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 6f6b96c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/build.properties b/plugins/org.eclipse.jst.j2ee.ejb/build.properties
deleted file mode 100644
index 2c3a5c9..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/build.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
- plugin.properties,\
- icons/,\
- templates/,\
- .,\
- META-INF/,\
- about.html
-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 9b56dc5..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/deployables/EJBDeployableArtifactAdapterUtil.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.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.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;
-
-/**
- * @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 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 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/extensions/BackendMigration.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/extensions/BackendMigration.java
deleted file mode 100644
index 9858248..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/extensions/BackendMigration.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jul 26, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.ejb.internal.extensions;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.internal.J2EEStatus;
-
-
-/**
- * @author vijayb
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public interface BackendMigration {
- public J2EEStatus migrate(IProject project, boolean flag);
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/extensions/BackendMigrationExtension.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/extensions/BackendMigrationExtension.java
deleted file mode 100644
index bc3f972..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/extensions/BackendMigrationExtension.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jul 26, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.ejb.internal.extensions;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.ejb.internal.plugin.Assert;
-
-/**
- * @author vijayb
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public class BackendMigrationExtension {
- private String id = null;
- private BackendMigration instance;
- private boolean errorCondition = false;
- private IConfigurationElement element;
- public static final String BACKEND_MIGRATION_EXTENSION = "backendMigrationExt"; //$NON-NLS-1$
- public static final String RUN = "run"; //$NON-NLS-1$
- public static final String ATT_ID = "id"; //$NON-NLS-1$
- public static final String ATT_CLASS = "class"; //$NON-NLS-1$
-
- /**
- *
- */
- public BackendMigrationExtension() {
- super();
- }
-
- public BackendMigration getInstance() {
- try {
- if (instance == null && !errorCondition)
- instance = (BackendMigration) element.createExecutableExtension("run"); //$NON-NLS-1$
- } catch (Throwable e) {
- Logger.getLogger().logError(e);
- errorCondition = true;
- }
- return instance;
- }
-
- public BackendMigrationExtension(IConfigurationElement element) {
- Assert.isLegal(BACKEND_MIGRATION_EXTENSION.equals(element.getName()), "Extensions must be of the type \"" + BACKEND_MIGRATION_EXTENSION + "\"."); //$NON-NLS-1$ //$NON-NLS-2$
- this.element = element;
- init();
- }
-
- private void init() {
- this.id = this.element.getAttribute(ATT_ID);
- }
-
- /**
- * @return Returns the id.
- */
- public String getId() {
- return id;
- }
-
- /**
- * @param id
- * The id to set.
- */
- public void setId(String id) {
- this.id = id;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/extensions/BackendMigrationExtensionReader.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/extensions/BackendMigrationExtensionReader.java
deleted file mode 100644
index 21ddf40..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/extensions/BackendMigrationExtensionReader.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jul 26, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.ejb.internal.extensions;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.RegistryReader;
-import org.eclipse.jst.j2ee.ejb.internal.plugin.EjbPlugin;
-
-/**
- * @author vijayb
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public class BackendMigrationExtensionReader extends RegistryReader {
- static BackendMigrationExtensionReader instance = null;
- protected List backendMigrationExtensions;
-
- /**
- * @param registry
- * @param pluginID
- * @param extensionPoint
- */
- public BackendMigrationExtensionReader() {
- super(EjbPlugin.PLUGIN_ID, "BackendMigration"); //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement)
- */
- public boolean readElement(IConfigurationElement element) {
- if (BackendMigrationExtension.BACKEND_MIGRATION_EXTENSION.equals(element.getName())) {
- addExtension(element);
- return true;
- }
- return false;
- }
-
- /**
- * Gets the instance.
- *
- * @return Returns a BackendMigrationExtensionReader
- */
- public static BackendMigrationExtensionReader getInstance() {
- if (instance == null) {
- instance = new BackendMigrationExtensionReader();
- instance.readRegistry();
- }
- return instance;
- }
-
- /**
- * Sets the extension point.
- *
- * @param extensions
- * The extensions to set
- */
- protected void addExtension(IConfigurationElement newExtension) {
- getBackendMigrationExtensions().add(new BackendMigrationExtension(newExtension));
- }
-
- /**
- * Sets the extension point.
- *
- * @param extensions
- * The extensions to set
- */
- protected void addExtensionPoint(BackendMigrationExtensionReader newExtension) {
- if (backendMigrationExtensions == null)
- backendMigrationExtensions = new ArrayList();
- backendMigrationExtensions.add(newExtension);
- }
-
- /**
- * @return Returns the handlerExtensions.
- */
- protected List getBackendMigrationExtensions() {
- if (backendMigrationExtensions == null)
- backendMigrationExtensions = new ArrayList();
- return backendMigrationExtensions;
- }
-
- /**
- * @return the appropriate handler for the project based on priorities of those which are
- * available and enabled
- */
- public BackendMigration getBackendMigrationExt() {
- BackendMigrationExtension backendMigrationExt;
- for (Iterator backendMigExtItr = getBackendMigrationExtensions().iterator(); backendMigExtItr.hasNext();) {
- backendMigrationExt = (BackendMigrationExtension) backendMigExtItr.next();
- return backendMigrationExt.getInstance();
- }
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/extensions/ChildProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/extensions/ChildProvider.java
deleted file mode 100644
index 1b31442..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/extensions/ChildProvider.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.extensions;
-
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-
-
-/**
- * @author cbridgha
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- */
-public interface ChildProvider {
- Collection getChildren(Object object, AdapterFactory factory);
- Collection getBackends(EJBArtifactEdit artifactEdit);
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/extensions/Delete11Relationships.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/extensions/Delete11Relationships.java
deleted file mode 100644
index 27a540d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/extensions/Delete11Relationships.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jun 28, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.ejb.internal.extensions;
-
-import org.eclipse.jst.j2ee.ejb.CommonRelationship;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-
-
-/**
- * @author vijayb
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public interface Delete11Relationships {
- public void runDeleteDelete11Relationships(CommonRelationship relationship, EJBArtifactEdit ejbArtifactEdit);
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/extensions/Delete11RelationshipsExtension.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/extensions/Delete11RelationshipsExtension.java
deleted file mode 100644
index 3a5680f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/extensions/Delete11RelationshipsExtension.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jun 28, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.ejb.internal.extensions;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.ejb.internal.plugin.Assert;
-
-/**
- * @author vijayb
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public class Delete11RelationshipsExtension {
- private String id = null;
- private Delete11Relationships instance;
- private boolean errorCondition = false;
- private IConfigurationElement element;
- public static final String DELETE_11_RELATIONSHIPS_EXTENSION = "delete11RelationshipsExHandler"; //$NON-NLS-1$
- public static final String RUN = "run"; //$NON-NLS-1$
- public static final String ATT_ID = "id"; //$NON-NLS-1$
- public static final String ATT_CLASS = "class"; //$NON-NLS-1$
-
- /**
- *
- */
- public Delete11RelationshipsExtension() {
- super();
- }
-
- public Delete11Relationships getInstance() {
- try {
- if (instance == null && !errorCondition)
- instance = (Delete11Relationships) element.createExecutableExtension("run"); //$NON-NLS-1$
- } catch (Throwable e) {
- Logger.getLogger().logError(e);
- errorCondition = true;
- }
- return instance;
- }
-
- public Delete11RelationshipsExtension(IConfigurationElement element) {
- Assert.isLegal(DELETE_11_RELATIONSHIPS_EXTENSION.equals(element.getName()), "Extensions must be of the type \"" + DELETE_11_RELATIONSHIPS_EXTENSION + "\"."); //$NON-NLS-1$ //$NON-NLS-2$
- this.element = element;
- init();
- }
-
- private void init() {
- this.id = this.element.getAttribute(ATT_ID);
- }
-
- /**
- * @return Returns the id.
- */
- public String getId() {
- return id;
- }
-
- /**
- * @param id
- * The id to set.
- */
- public void setId(String id) {
- this.id = id;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/extensions/Delete11RelationshipsExtensionReader.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/extensions/Delete11RelationshipsExtensionReader.java
deleted file mode 100644
index 55fbbe2..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/extensions/Delete11RelationshipsExtensionReader.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jun 28, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.ejb.internal.extensions;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.RegistryReader;
-import org.eclipse.jst.j2ee.ejb.internal.plugin.EjbPlugin;
-
-/**
- * @author vijayb
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public class Delete11RelationshipsExtensionReader extends RegistryReader {
- static Delete11RelationshipsExtensionReader instance = null;
- protected List delete11RelationshipsExtensions;
-
- /**
- * @param registry
- * @param pluginID
- * @param extensionPoint
- */
- public Delete11RelationshipsExtensionReader() {
- super(EjbPlugin.PLUGIN_ID, "Delete11Relationships"); //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement)
- */
- public boolean readElement(IConfigurationElement element) {
- if (Delete11RelationshipsExtension.DELETE_11_RELATIONSHIPS_EXTENSION.equals(element.getName())) {
- addExtension(element);
- return true;
- }
- return false;
- }
-
- /**
- * Sets the extension point.
- *
- * @param extensions
- * The extensions to set
- */
- protected void addExtension(IConfigurationElement newExtension) {
- getDelete11RelationshipsExtensions().add(new Delete11RelationshipsExtension(newExtension));
- }
-
- /**
- * Sets the extension point.
- *
- * @param extensions
- * The extensions to set
- */
- protected void addExtensionPoint(Delete11RelationshipsExtensionReader newExtension) {
- if (delete11RelationshipsExtensions == null)
- delete11RelationshipsExtensions = new ArrayList();
- delete11RelationshipsExtensions.add(newExtension);
- }
-
- /**
- * @return Returns the handlerExtensions.
- */
- protected List getDelete11RelationshipsExtensions() {
- if (delete11RelationshipsExtensions == null)
- delete11RelationshipsExtensions = new ArrayList();
- return delete11RelationshipsExtensions;
- }
-
- /**
- * Gets the instance.
- *
- * @return Returns a Delete11RelationshipsExtensionReader
- */
- public static Delete11RelationshipsExtensionReader getInstance() {
- if (instance == null) {
- instance = new Delete11RelationshipsExtensionReader();
- instance.readRegistry();
- }
- return instance;
- }
-
- /**
- * @return the appropriate handler for the project based on priorities of those which are
- * available and enabled
- */
- public Delete11Relationships getDeleteDeployCodeExt() {
- Delete11RelationshipsExtension del11RelExt;
- for (Iterator del11RelExtItr = getDelete11RelationshipsExtensions().iterator(); del11RelExtItr.hasNext();) {
- del11RelExt = (Delete11RelationshipsExtension) del11RelExtItr.next();
- return del11RelExt.getInstance();
- }
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/extensions/DeleteDeployCode.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/extensions/DeleteDeployCode.java
deleted file mode 100644
index 5136433..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/extensions/DeleteDeployCode.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jun 23, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.ejb.internal.extensions;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-
-/**
- * @author vijayb
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public interface DeleteDeployCode {
- public void runDeleteDeployCode(IProject ejbProject, List enterpriseBeans);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/extensions/DeleteDeployCodeExtension.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/extensions/DeleteDeployCodeExtension.java
deleted file mode 100644
index d7dfcd8..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/extensions/DeleteDeployCodeExtension.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jun 23, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.ejb.internal.extensions;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.ejb.internal.plugin.Assert;
-
-/**
- * @author vijayb
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public class DeleteDeployCodeExtension {
- private String id = null;
- private DeleteDeployCode instance;
- private boolean errorCondition = false;
- private IConfigurationElement element;
- public static final String DELETE_DEPLOY_CODE_EXTENSION = "deleteDeployCodeExt"; //$NON-NLS-1$
- public static final String RUN = "run"; //$NON-NLS-1$
- public static final String ATT_ID = "id"; //$NON-NLS-1$
- public static final String ATT_CLASS = "class"; //$NON-NLS-1$
-
- /**
- *
- */
- public DeleteDeployCodeExtension() {
- super();
- }
-
- public DeleteDeployCode getInstance() {
- try {
- if (instance == null && !errorCondition)
- instance = (DeleteDeployCode) element.createExecutableExtension("run"); //$NON-NLS-1$
- } catch (Throwable e) {
- Logger.getLogger().logError(e);
- errorCondition = true;
- }
- return instance;
- }
-
- public DeleteDeployCodeExtension(IConfigurationElement element) {
- Assert.isLegal(DELETE_DEPLOY_CODE_EXTENSION.equals(element.getName()), "Extensions must be of the type \"" + DELETE_DEPLOY_CODE_EXTENSION + "\"."); //$NON-NLS-1$ //$NON-NLS-2$
- this.element = element;
- init();
- }
-
- private void init() {
- this.id = this.element.getAttribute(ATT_ID);
- }
-
- /**
- * @return Returns the id.
- */
- public String getId() {
- return id;
- }
-
- /**
- * @param id
- * The id to set.
- */
- public void setId(String id) {
- this.id = id;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/extensions/DeleteDeployCodeExtensionReader.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/extensions/DeleteDeployCodeExtensionReader.java
deleted file mode 100644
index f5bca09..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/extensions/DeleteDeployCodeExtensionReader.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jun 23, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.ejb.internal.extensions;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.RegistryReader;
-import org.eclipse.jst.j2ee.ejb.internal.plugin.EjbPlugin;
-
-
-/**
- * @author vijayb
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public class DeleteDeployCodeExtensionReader extends RegistryReader {
- static DeleteDeployCodeExtensionReader instance = null;
- protected List deleteDeployCodeExtensions;
-
- /**
- * @param registry
- * @param pluginID
- * @param extensionPoint
- */
- public DeleteDeployCodeExtensionReader() {
- super(EjbPlugin.PLUGIN_ID, "DeleteDeployCode"); //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement)
- */
- public boolean readElement(IConfigurationElement element) {
- if (DeleteDeployCodeExtension.DELETE_DEPLOY_CODE_EXTENSION.equals(element.getName())) {
- addExtension(element);
- return true;
- }
- return false;
- }
-
- /**
- * Gets the instance.
- *
- * @return Returns a DeleteDeployCodeExtensionReader
- */
- public static DeleteDeployCodeExtensionReader getInstance() {
- if (instance == null) {
- instance = new DeleteDeployCodeExtensionReader();
- instance.readRegistry();
- }
- return instance;
- }
-
- /**
- * Sets the extension point.
- *
- * @param extensions
- * The extensions to set
- */
- protected void addExtension(IConfigurationElement newExtension) {
- getDeleteDeployCodeExtensions().add(new DeleteDeployCodeExtension(newExtension));
- }
-
- /**
- * Sets the extension point.
- *
- * @param extensions
- * The extensions to set
- */
- protected void addExtensionPoint(DeleteDeployCodeExtensionReader newExtension) {
- if (deleteDeployCodeExtensions == null)
- deleteDeployCodeExtensions = new ArrayList();
- deleteDeployCodeExtensions.add(newExtension);
- }
-
- /**
- * @return Returns the handlerExtensions.
- */
- protected List getDeleteDeployCodeExtensions() {
- if (deleteDeployCodeExtensions == null)
- deleteDeployCodeExtensions = new ArrayList();
- return deleteDeployCodeExtensions;
- }
-
- /**
- * @return the appropriate handler for the project based on priorities of those which are
- * available and enabled
- */
- public DeleteDeployCode getDeleteDeployCodeExt() {
- DeleteDeployCodeExtension delDepCodeExt;
- for (Iterator delDepCodeExtItr = getDeleteDeployCodeExtensions().iterator(); delDepCodeExtItr.hasNext();) {
- delDepCodeExt = (DeleteDeployCodeExtension) delDepCodeExtItr.next();
- return delDepCodeExt.getInstance();
- }
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/extensions/EJBExtManager.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/extensions/EJBExtManager.java
deleted file mode 100644
index c5dd810..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/extensions/EJBExtManager.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.extensions;
-
-public class EJBExtManager {
- public static EJBExtension extension;
-
- public static EJBExtension getEJBWsExt() {
- return extension;
- }
-
- public static void registerEJBWsExtension(EJBExtension ext) {
- extension = ext;
- }
-
- public static void removeEJBWsExtension() {
- extension = null;
- }
-
- public EJBExtManager() {
- super();
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/extensions/EJBExtension.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/extensions/EJBExtension.java
deleted file mode 100644
index 4f68fb1..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/extensions/EJBExtension.java
+++ /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
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.extensions;
-
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-
-public interface EJBExtension {
- void addExtendedAdapterFactory(ResourceSet aContext);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/extensions/EJBExtensionRegistry.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/extensions/EJBExtensionRegistry.java
deleted file mode 100644
index e4e52a6..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/extensions/EJBExtensionRegistry.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Oct 29, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.ejb.internal.extensions;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.RegistryReader;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-/**
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class EJBExtensionRegistry extends RegistryReader {
-
- static final String EXTENSION_NAME = "EJBExtension"; //$NON-NLS-1$
- static final String ELEMENT_EJB_EXTENSION = "ejbExtension"; //$NON-NLS-1$
- static final String EJB_EXTENSION_CLASS = "extensionClass"; //$NON-NLS-1$
- private static EJBExtensionRegistry INSTANCE = null;
-
- public EJBExtensionRegistry() {
- super(J2EEPlugin.PLUGIN_ID, EXTENSION_NAME);
- }
-
- public static EJBExtensionRegistry getInstance() {
- if (INSTANCE == null) {
- INSTANCE = new EJBExtensionRegistry();
- INSTANCE.readRegistry();
- }
- return INSTANCE;
- }
-
- /**
- * readElement() - parse and deal w/ an extension like: <earModuleExtension extensionClass =
- * "com.ibm.etools.web.plugin.WebModuleExtensionImpl"/>
- */
- public boolean readElement(IConfigurationElement element) {
- if (!element.getName().equals(ELEMENT_EJB_EXTENSION))
- return false;
-
- EJBExtension extension = null;
- try {
- extension = (EJBExtension) element.createExecutableExtension(EJB_EXTENSION_CLASS);
- } catch (CoreException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- if (extension != null)
- addModuleExtension(extension);
- return true;
- }
-
-
- private static void addModuleExtension(EJBExtension ext) {
- EJBExtManager.registerEJBWsExtension(ext);
- }
-
-}
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 253fcd6..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, 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.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 0564e2e..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, 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.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 92deaf3..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/plugin/EjbModuleExtensionImpl.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on 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.datamodel.properties.IEjbComponentCreationDataModelProperties;
-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.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.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;
- }
-
- /*
- * (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(IEjbComponentCreationDataModelProperties.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 b0d81d8..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/plugin/EjbPlugin.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.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.IExtensionRegistry;
-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.ejb.internal.impl.EJBJarResourceFactory;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPluginResourceHandler;
-import org.eclipse.wst.common.componentcore.internal.impl.WTPResourceFactoryRegistry;
-import org.eclipse.wst.common.frameworks.internal.WTPPlugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-
-/**
- * This is a top-level class of the j2ee plugin.
- *
- * @see AbstractUIPlugin for additional information on UI plugins
- */
-public class 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);
- EJBJarResourceFactory.register(WTPResourceFactoryRegistry.INSTANCE);
- }
-
- public String getString(String key, boolean translate) {
- // TODO For now... translate not supported
- return getString(key);
- }
-
- public String getString(String key, Object[] substitutions, boolean translate) {
- // TODO For now... translate not supported
- return getString(key,substitutions);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/ejb/datamodel/properties/IEJBClientComponentCreationDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/ejb/datamodel/properties/IEJBClientComponentCreationDataModelProperties.java
deleted file mode 100644
index 5fcfd59..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/ejb/datamodel/properties/IEJBClientComponentCreationDataModelProperties.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.datamodel.properties;
-
-import org.eclipse.jst.j2ee.datamodel.properties.IJavaComponentCreationDataModelProperties;
-/**
- * <p>
- * IEJBClientComponentCreationDataModelProperties provides properties to the
- * EJBClientComponentCreationDataModelProvider as well as all extending interfaces extending
- * IEJBClientComponentCreationDataModelProperties
- *
- * @see org.eclipse.jst.j2ee.internal.ejb.archiveoperations.EJBClientComponentCreationDataModelProvider
- * </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
- *
- * @plannedfor 1.0
- */
-public interface IEJBClientComponentCreationDataModelProperties extends IJavaComponentCreationDataModelProperties {
- /**
- * Required, type String, the name of the Ejb Component
- */
- public static final String EJB_COMPONENT_NAME = "IEJBClientComponentCreationDataModelProperties.EJB_COMPONENT_NAME"; //$NON-NLS-1$
-
- /**
- * Required, type String, the project name of the Ejb Component
- */
- public static final String EJB_PROJECT_NAME = "IEJBClientComponentCreationDataModelProperties.EJB_PROJECT_NAME"; //$NON-NLS-1$
-
- /**
- * Required, type String, the deploy name of the Ejb component
- */
- public static final String EJB_COMPONENT_DEPLOY_NAME = "IEJBClientComponentCreationDataModelProperties.EJB_COMPONENT_DEPLOY_NAME"; //$NON-NLS-1$
- /**
- * Optional, type String, this default value is set by EJBClientComponentCreationDataModelProvider
- */
- public static final String CLIENT_COMPONENT_URI = "IEJBClientComponentCreationDataModelProperties.CLIENT_COMPONENT_URI"; //$NON-NLS-1$
-
- /**
- * Required, type Boolean, the default value is <code>Boolean.TRUE</code>
- */
- public static final String ADD_TO_EAR = "IEJBClientComponentCreationDataModelProperties.ADD_TO_EAR"; //$NON-NLS-1$
-
- /**
- * Optional, type String, this value needs to be set if the property ADD_TO_EAR is set to <code>Boolean.TRUE</code>
- */
-
- public static final String EAR_COMPONENT_NAME = "IEJBClientComponentCreationDataModelProperties.EAR_COMPONENT_NAME"; //$NON-NLS-1$
- /**
- * Required, type String, the project name of the Ejb Component
- */
- public static final String EAR_PROJECT_NAME = "IEJBClientComponentCreationDataModelProperties.EAR_PROJECT_NAME"; //$NON-NLS-1$
-
- /**
- * Optional, type String, this value needs to be set if the property ADD_TO_EAR is set to <code>Boolean.TRUE</code>
- */
-
- public static final String EAR_COMPONENT_DEPLOY_NAME = "IEJBClientComponentCreationDataModelProperties.EAR_COMPONENT_DEPLOY_NAME"; //$NON-NLS-1$
-
- /**
- * Required, type Boolean, the default value is <code>Boolean.FALSE</code>, if this property is set to <code>Boolean.TRUE</code>
- * the client component will be created in a separate project
- */
-
- public static final String CREATE_PROJECT = "IEJBClientComponentCreationDataModelProperties.CREATE_PROJECT"; //$NON-NLS-1$
-
-}
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/IEjbComponentCreationDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/ejb/datamodel/properties/IEjbComponentCreationDataModelProperties.java
deleted file mode 100644
index 4dabd94..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/ejb/datamodel/properties/IEjbComponentCreationDataModelProperties.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.datamodel.properties;
-/**
- * <p>
- * IEjbComponentCreationDataModelProperties provides properties to the
- * EjbComponentCreationDataModelProvider as well as all extending interfaces extending
- * IEjbComponentCreationDataModelProperties
- * @see org.eclipse.jst.j2ee.internal.ejb.archiveoperations.EjbComponentCreationDataModelProvider
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- * @see org.eclipse.jst.j2ee.datamodel.properties.IJavaComponentCreationDataModelProperties
- * @see org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties
- * @plannedfor 1.0
- */
-
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties;
-
-public interface IEjbComponentCreationDataModelProperties extends IJ2EEComponentCreationDataModelProperties {
-
- /**
- * Required, type Boolean, the default value is <code>Boolean.TRUE</code>
- */
- public static final String CREATE_CLIENT = "IEjbComponentCreationDataModelProperties.CREATE_CLIENT"; //$NON-NLS-1$
-
- /**
- * Required, type Boolean, the default value is <code>Boolean.FALSE</code>
- */
- public static final String CREATE_DEFAULT_SESSION_BEAN = "IEjbComponentCreationDataModelProperties.CREATE_DEFAULT_SESSION_BEAN"; //$NON-NLS-1$
-
- /**
- * Optional, type IDataModelProvider, needs to be set if the property CREATE_CLIENT is <code>Boolean.TRUE</code>
- */
-
- public static final String NESTED_MODEL_EJB_CLIENT_CREATION = "IEjbComponentCreationDataModelProperties.NESTED_MODEL_EJB_CLIENT_CREATION"; //$NON-NLS-1$
-}
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/EJBClientComponentDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EJBClientComponentDataModelProvider.java
deleted file mode 100644
index c8d8a63..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EJBClientComponentDataModelProvider.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.archiveoperations;
-
-import java.util.Set;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel;
-import org.eclipse.jst.j2ee.ejb.datamodel.properties.IEJBClientComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.ejb.datamodel.properties.IEjbComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.archive.operations.JavaComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.EJBCreationResourceHandler;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.internal.WTPPlugin;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-public class EJBClientComponentDataModelProvider extends JavaComponentCreationDataModelProvider implements IEJBClientComponentCreationDataModelProperties, IAnnotationsDataModel {
-
- public EJBClientComponentDataModelProvider() {
- super();
- }
-
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(EJB_COMPONENT_NAME);
- propertyNames.add(EJB_PROJECT_NAME);
- propertyNames.add(EJB_COMPONENT_DEPLOY_NAME);
- propertyNames.add(CLIENT_COMPONENT_URI);
- propertyNames.add(CREATE_PROJECT);
- propertyNames.add(EAR_COMPONENT_DEPLOY_NAME);
- propertyNames.add(IEjbComponentCreationDataModelProperties.EAR_COMPONENT_PROJECT);
- propertyNames.add(USE_ANNOTATIONS);
- return propertyNames;
- }
-
- public boolean propertySet(String propertyName, Object propertyValue) {
- boolean status = super.propertySet(propertyName, propertyValue);
- if (propertyName.equals(COMPONENT_NAME)) {
- if (!model.isPropertySet(CLIENT_COMPONENT_URI))
- model.notifyPropertyChange(CLIENT_COMPONENT_URI, DataModelEvent.ENABLE_CHG);
- }else if (propertyName.equals(JAVASOURCE_FOLDER)){
- //unless MANIFEST folder is opened up, it is set as same as Java source folder
- setProperty(MANIFEST_FOLDER, getProperty(JAVASOURCE_FOLDER)+ "/" + J2EEConstants.META_INF);
- }
- return status;
- }
-
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(COMPONENT_NAME)) {
- return getDefaultClientModuleName();
- } else if (propertyName.equals(CLIENT_COMPONENT_URI)) {
- return getStringProperty(COMPONENT_NAME).trim().replace(' ', '_') + ".jar"; //$NON-NLS-1$
- } else if (propertyName.equals(COMPONENT_DEPLOY_NAME)) {
- return getStringProperty(COMPONENT_NAME); //$NON-NLS-1$
- } else if (propertyName.equals(JAVASOURCE_FOLDER)) {
- return "/" + "ejbModule";//$NON-NLS-2$
- } else if (propertyName.equals(USE_ANNOTATIONS))
- return Boolean.FALSE;
- return super.getDefaultProperty(propertyName);
- }
-
- private String getDefaultClientModuleName() {
- String ejbModuleName = getStringProperty(EJB_COMPONENT_NAME);
- String moduleName = ejbModuleName + "Client"; //$NON-NLS-1$
- return moduleName;
- }
-
- public IStatus validate(String propertyName) {
- IStatus status = super.validate(propertyName);
- if (status.isOK()) {
- if (propertyName.equals(COMPONENT_NAME)) {
- String ejbModuleName = getStringProperty(EJB_COMPONENT_NAME);
- String clientModuleName = getStringProperty(COMPONENT_NAME);
- if (ejbModuleName.equals(clientModuleName)) {
- return WTPCommonPlugin.createErrorStatus(EJBCreationResourceHandler.CLIENT_SAME_NAME_AS_EJB);
- } else if (!WTPPlugin.isPlatformCaseSensitive() && ejbModuleName.equalsIgnoreCase(clientModuleName)) {
- return WTPCommonPlugin.createErrorStatus(EJBCreationResourceHandler.CLIENT_SAME_NAME_AS_EJB);
- }
- }
- if (propertyName.equals(CLIENT_COMPONENT_URI)) {
- status = validateClientJarUri();
- }
- }
- return status;
- }
-
- public IStatus validateClientJarUri() {
- String clientJarURI = getStringProperty(CLIENT_COMPONENT_URI);
- if (clientJarURI == null || clientJarURI.trim().length() == 0)
- return WTPCommonPlugin.createErrorStatus(EJBCreationResourceHandler.CLIENT_JAR_URI_NOT_RESOLVE_UI_, null);
-
- return OK_STATUS;
- }
-
- public boolean hasExistingClientJar() {
- return false;
- }
-}
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 c13f020..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EJBComponentExportOperation.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.archiveoperations;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException;
-import org.eclipse.jst.j2ee.internal.archive.operations.J2EEArtifactExportOperation;
-import org.eclipse.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 {
- try {
- createModuleFile();
- getModuleFile().saveAsNoReopen(getDestinationPath().toOSString());
- } catch (SaveFailureException ex) {
- throw ex;
- } catch (Exception e) {
- throw new SaveFailureException(EJBArchiveOpsResourceHandler.ARCHIVE_OPERATION_OpeningArchive, e);
- }
- }
-
- 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 aa16c73..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EJBComponentImportOperation.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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.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;
- }
-}
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 10e5531..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EJBComponentLoadStrategyImpl.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.archiveoperations;
-
-import org.eclipse.jst.j2ee.internal.archive.operations.J2EEComponentLoadStrategyImpl;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class EJBComponentLoadStrategyImpl extends J2EEComponentLoadStrategyImpl {
-
- public EJBComponentLoadStrategyImpl(IVirtualComponent vComponent) {
- super(vComponent);
- }
-}
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/EjbClientProjectCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EjbClientProjectCreationDataModelProvider.java
deleted file mode 100644
index fd16a85..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EjbClientProjectCreationDataModelProvider.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.archiveoperations;
-
-import java.util.Set;
-
-import org.eclipse.jst.j2ee.project.facet.JavaUtilityProjectCreationDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-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);
- 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);
- }
-
-}
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 1789b6b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EjbClientProjectCreationOperation.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.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.jst.j2ee.project.facet.JavaUtilityProjectCreationOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class EjbClientProjectCreationOperation
- extends JavaUtilityProjectCreationOperation
- implements IEjbClientProjectCreationDataModelProperties{
-
- public EjbClientProjectCreationOperation(IDataModel model) {
- super(model);
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- return super.execute(monitor, info);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EjbComponentCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EjbComponentCreationDataModelProvider.java
deleted file mode 100644
index 03f868c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EjbComponentCreationDataModelProvider.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchiveFactoryImpl;
-import org.eclipse.jst.j2ee.ejb.datamodel.properties.IEJBClientComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.ejb.datamodel.properties.IEjbComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.CreationConstants;
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.EJBCreationResourceHandler;
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.EjbComponentCreationFacetOperation;
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.EjbFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.internal.WTPPlugin;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-/**
- * @deprecated
- * @see EjbFacetProjectCreationDataModelProvider
- */
-
-public class EjbComponentCreationDataModelProvider extends J2EEComponentCreationDataModelProvider implements IEjbComponentCreationDataModelProperties {
-
-
- public EjbComponentCreationDataModelProvider() {
- super();
- }
-
- public void init() {
- super.init();
- IDataModel ejbClientComponentDataModel = DataModelFactory.createDataModel(new EJBClientComponentDataModelProvider());
- model.setProperty(NESTED_MODEL_EJB_CLIENT_CREATION, ejbClientComponentDataModel);
- }
-
- public IDataModelOperation getDefaultOperation() {
- //return new EjbComponentCreationOperation(model);
- return new EjbComponentCreationFacetOperation(model);
- }
-
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(CREATE_CLIENT);
- propertyNames.add(CREATE_DEFAULT_SESSION_BEAN);
- propertyNames.add(NESTED_MODEL_EJB_CLIENT_CREATION);
- return propertyNames;
- }
-
- /**
- * @return Returns the default J2EE spec level based on the Global J2EE Preference
- */
- protected Integer getDefaultComponentVersion() {
- int highestJ2EEPref = J2EEPlugin.getDefault().getJ2EEPreferences().getHighestJ2EEVersionID();
- switch (highestJ2EEPref) {
- case (J2EEVersionConstants.J2EE_1_4_ID) :
- return new Integer(J2EEVersionConstants.EJB_2_1_ID);
- case (J2EEVersionConstants.J2EE_1_3_ID) :
- return new Integer(J2EEVersionConstants.EJB_2_0_ID);
- case (J2EEVersionConstants.J2EE_1_2_ID) :
- return new Integer(J2EEVersionConstants.EJB_1_1_ID);
- default :
- return new Integer(J2EEVersionConstants.EJB_2_1_ID);
- }
- }
-
- public boolean propertySet(String propertyName, Object propertyValue) {
- boolean doSet = super.propertySet(propertyName, propertyValue);
- if (propertyName.equals(ADD_TO_EAR)) {
- if (!((Boolean) propertyValue).booleanValue()) {
- model.setProperty(CREATE_CLIENT, propertyValue);
- model.notifyPropertyChange(CREATE_CLIENT, IDataModel.ENABLE_CHG);
- }
- model.notifyPropertyChange(CREATE_CLIENT, DataModelEvent.ENABLE_CHG);
- } else if (propertyName.equals(USE_ANNOTATIONS)) {
- model.notifyPropertyChange(COMPONENT_VERSION, DataModelEvent.ENABLE_CHG);
- IDataModel ejbClientComponentDataModel = (IDataModel) model.getProperty(NESTED_MODEL_EJB_CLIENT_CREATION);
- if (ejbClientComponentDataModel != null)
- ejbClientComponentDataModel.setProperty(USE_ANNOTATIONS, propertyValue);
- } else if (propertyName.equals(COMPONENT_VERSION)) {
- if (getJ2EEVersion() < J2EEVersionConstants.VERSION_1_3) {
- model.setProperty(USE_ANNOTATIONS, Boolean.FALSE);
- IDataModel ejbClientComponentDataModel = (IDataModel) model.getProperty(NESTED_MODEL_EJB_CLIENT_CREATION);
- if (ejbClientComponentDataModel != null)
- ejbClientComponentDataModel.setProperty(USE_ANNOTATIONS, Boolean.FALSE);
- }
- model.notifyPropertyChange(USE_ANNOTATIONS, DataModelEvent.ENABLE_CHG);
- }
- // else if (propertyName.equals(CREATE_CLIENT)) {
- // TODO: rework validation hooks
- // getNestedEJBClientComponentDataModel().setProperty(EJBClientComponentDataModel.CREATE_PROJECT,
- // propertyValue);
- // if (getBooleanProperty(CREATE_CLIENT)) {
- // ((IDataModel)model.getProperty(NESTED_MODEL_EJB_CLIENT_CREATION)).notifyPropertyChange();
- // } else {
- // ((IDataModel)model.getProperty(NESTED_MODEL_EJB_CLIENT_CREATION)).disableValidation();
- // }
- // }
- else if (propertyName.equals(COMPONENT_NAME)) {
- IDataModel ejbClientComponentDataModel = (IDataModel) model.getProperty(NESTED_MODEL_EJB_CLIENT_CREATION);
- ejbClientComponentDataModel.setProperty(IEJBClientComponentCreationDataModelProperties.EJB_COMPONENT_NAME, propertyValue);
- if (!ejbClientComponentDataModel.isPropertySet(COMPONENT_NAME))
- ejbClientComponentDataModel.notifyPropertyChange(COMPONENT_NAME, IDataModel.DEFAULT_CHG);
- if (!ejbClientComponentDataModel.isPropertySet(IEJBClientComponentCreationDataModelProperties.CLIENT_COMPONENT_URI))
- ejbClientComponentDataModel.notifyPropertyChange(IEJBClientComponentCreationDataModelProperties.CLIENT_COMPONENT_URI, IDataModel.DEFAULT_CHG);
-
- if (getBooleanProperty(CREATE_CLIENT)) {
- ejbClientComponentDataModel.setProperty(IEJBClientComponentCreationDataModelProperties.CREATE_PROJECT, getProperty(CREATE_CLIENT));
- ejbClientComponentDataModel.setProperty(IEJBClientComponentCreationDataModelProperties.PROJECT_NAME, ejbClientComponentDataModel.getStringProperty(IEJBClientComponentCreationDataModelProperties.COMPONENT_NAME));
- }
- if (getBooleanProperty(ADD_TO_EAR)) {
- ejbClientComponentDataModel.setProperty(IEJBClientComponentCreationDataModelProperties.EAR_COMPONENT_DEPLOY_NAME, getProperty(EAR_COMPONENT_DEPLOY_NAME));
- }
- } else if (propertyName.equals(EAR_COMPONENT_PROJECT)) {
- IDataModel ejbClientComponentDataModel = (IDataModel) model.getProperty(NESTED_MODEL_EJB_CLIENT_CREATION);
- ejbClientComponentDataModel.setProperty(EAR_COMPONENT_PROJECT, model.getProperty(EAR_COMPONENT_PROJECT));
- }else if (propertyName.equals(JAVASOURCE_FOLDER)){
- //unless MANIFEST folder is opened up, it is set as same as Java source folder
- setProperty(MANIFEST_FOLDER, getProperty(JAVASOURCE_FOLDER)+ "/" + J2EEConstants.META_INF);
- }
- if (getBooleanProperty(CREATE_CLIENT)) {
- IDataModel ejbClientComponentDataModel = (IDataModel) model.getProperty(NESTED_MODEL_EJB_CLIENT_CREATION);
- if (propertyName.equals(CREATE_CLIENT) || propertyName.equals(PROJECT_NAME) || propertyName.equals(ADD_TO_EAR) || propertyName.equals(COMPONENT_DEPLOY_NAME)
- || propertyName.equals(JAVASOURCE_FOLDER) ) {
- ejbClientComponentDataModel.setProperty(IEJBClientComponentCreationDataModelProperties.CREATE_PROJECT, getProperty(CREATE_CLIENT));
- ejbClientComponentDataModel.setProperty(IEJBClientComponentCreationDataModelProperties.PROJECT_NAME, ejbClientComponentDataModel.getStringProperty(IEJBClientComponentCreationDataModelProperties.COMPONENT_NAME));
- ejbClientComponentDataModel.setProperty(IEJBClientComponentCreationDataModelProperties.EJB_PROJECT_NAME, getProperty(PROJECT_NAME));
- ejbClientComponentDataModel.setProperty(IEJBClientComponentCreationDataModelProperties.EJB_COMPONENT_DEPLOY_NAME, getProperty(COMPONENT_DEPLOY_NAME));
- ejbClientComponentDataModel.setProperty(IEJBClientComponentCreationDataModelProperties.JAVASOURCE_FOLDER, getProperty(JAVASOURCE_FOLDER));
- }
- }
-
- return doSet;
- }
-
- // private Object updateAddToEar() {
- // IRuntime type = getServerTargetDataModel().getRuntimeTarget();
- // Boolean ret = Boolean.FALSE;
- // IRuntime type = getProjectDataModel().getServerTargetDataModel().getRuntimeTarget();
- // if (type == null)
- // return Boolean.TRUE;
- // IRuntimeType rType = type.getRuntimeType();
- // if (rType == null)
- // return Boolean.TRUE;
- // return ret;
- // return new Boolean(!rType.getVendor().equals(APACHE_VENDER_NAME));
- // return null;
- // }
-
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(CREATE_CLIENT)) {
- return Boolean.TRUE;
- } else if (propertyName.equals(ADD_TO_EAR)) {
- return Boolean.TRUE;
- } else if (propertyName.equals(CREATE_DEFAULT_SESSION_BEAN)) {
- return Boolean.FALSE;
- } else if (propertyName.equals(DD_FOLDER)) {
- return IPath.SEPARATOR + CreationConstants.DEFAULT_EJB_SOURCE_FOLDER + IPath.SEPARATOR + J2EEConstants.META_INF;
- } else if (propertyName.equals(JAVASOURCE_FOLDER)) {
- return CreationConstants.DEFAULT_EJB_SOURCE_FOLDER;
- } else if (propertyName.equals(MANIFEST_FOLDER)) {
- return IPath.SEPARATOR + CreationConstants.DEFAULT_EJB_SOURCE_FOLDER + IPath.SEPARATOR + J2EEConstants.META_INF;
- } else {
- return super.getDefaultProperty(propertyName);
- }
- }
-
- public DataModelPropertyDescriptor getPropertyDescriptor(String propertyName) {
- if (propertyName.equals(COMPONENT_VERSION)) {
- Integer propertyValue = (Integer) getProperty(propertyName);
- String description = null;
- switch (propertyValue.intValue()) {
- case J2EEVersionConstants.EJB_1_1_ID :
- description = J2EEVersionConstants.VERSION_1_1_TEXT;
- break;
- case J2EEVersionConstants.EJB_2_0_ID :
- description = J2EEVersionConstants.VERSION_2_0_TEXT;
- break;
- case J2EEVersionConstants.EJB_2_1_ID :
- default :
- description = J2EEVersionConstants.VERSION_2_1_TEXT;
- break;
- }
- return new DataModelPropertyDescriptor(propertyValue, description);
- }
- return super.getPropertyDescriptor(propertyName);
- }
-
- public IStatus validate(String propertyName) {
- if (propertyName.equals(NESTED_MODEL_EJB_CLIENT_CREATION)) {
- if (getBooleanProperty(CREATE_CLIENT)) {
- IDataModel ejbClientComponentDataModel = ((IDataModel) model.getProperty(NESTED_MODEL_EJB_CLIENT_CREATION));
- String clientName = ejbClientComponentDataModel.getStringProperty(COMPONENT_NAME);
- String moduleName = getStringProperty(PROJECT_NAME);
- if (clientName.equals(moduleName)) {
- return WTPCommonPlugin.createErrorStatus(EJBCreationResourceHandler.CLIENT_SAME_NAME_AS_EJB);
- }
- if (!WTPPlugin.isPlatformCaseSensitive()) {
- if (clientName.toLowerCase().equals(moduleName.toLowerCase())) {
- return WTPCommonPlugin.createErrorStatus(EJBCreationResourceHandler.CLIENT_SAME_NAME_AS_EJB);
- }
- }
-
- if (getBooleanProperty(ADD_TO_EAR)) {
- String earName = getStringProperty(EAR_COMPONENT_NAME);
- if (clientName.equals(earName)) {
- return WTPCommonPlugin.createErrorStatus(EJBCreationResourceHandler.CLIENT_SAME_NAME_AS_EAR);
- }
- if (!WTPPlugin.isPlatformCaseSensitive()) {
- if (clientName.toLowerCase().equals(earName.toLowerCase())) {
- return WTPCommonPlugin.createErrorStatus(EJBCreationResourceHandler.CLIENT_SAME_NAME_AS_EAR);
- }
- }
- }
- }
- }
- return super.validate(propertyName);
- }
-
- protected DataModelPropertyDescriptor[] getValidComponentVersionDescriptors() {
- int highestJ2EEPref = J2EEPlugin.getDefault().getJ2EEPreferences().getHighestJ2EEVersionID();
- DataModelPropertyDescriptor[] descriptors = null;
- switch (highestJ2EEPref) {
- case J2EEVersionConstants.J2EE_1_2_ID :
- descriptors = new DataModelPropertyDescriptor[1];
- descriptors[0] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.EJB_1_1_ID), J2EEVersionConstants.VERSION_1_1_TEXT);
- break;
- case J2EEVersionConstants.J2EE_1_3_ID :
- descriptors = new DataModelPropertyDescriptor[2];
- descriptors[0] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.EJB_1_1_ID), J2EEVersionConstants.VERSION_1_1_TEXT);
- descriptors[1] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.EJB_2_0_ID), J2EEVersionConstants.VERSION_2_0_TEXT);
- break;
- case J2EEVersionConstants.J2EE_1_4_ID :
- default :
- descriptors = new DataModelPropertyDescriptor[3];
- descriptors[0] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.EJB_1_1_ID), J2EEVersionConstants.VERSION_1_1_TEXT);
- descriptors[1] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.EJB_2_0_ID), J2EEVersionConstants.VERSION_2_0_TEXT);
- descriptors[2] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.EJB_2_1_ID), J2EEVersionConstants.VERSION_2_1_TEXT);
- break;
- }
- return descriptors;
- }
-
- protected int convertModuleVersionToJ2EEVersion(int moduleVersion) {
- switch (moduleVersion) {
- case J2EEVersionConstants.EJB_1_0_ID :
- case J2EEVersionConstants.EJB_1_1_ID :
- return J2EEVersionConstants.J2EE_1_2_ID;
- case J2EEVersionConstants.EJB_2_0_ID :
- return J2EEVersionConstants.J2EE_1_3_ID;
- case J2EEVersionConstants.EJB_2_1_ID :
- return J2EEVersionConstants.J2EE_1_4_ID;
- }
- return -1;
- }
-
- protected Integer convertJ2EEVersionToModuleVersion(Integer j2eeVersion) {
- switch (j2eeVersion.intValue()) {
- case J2EEVersionConstants.J2EE_1_2_ID :
- return new Integer(J2EEVersionConstants.EJB_1_1_ID);
- case J2EEVersionConstants.J2EE_1_3_ID :
- return new Integer(J2EEVersionConstants.EJB_2_0_ID);
- case J2EEVersionConstants.J2EE_1_4_ID :
- return new Integer(J2EEVersionConstants.EJB_2_1_ID);
- }
- return super.convertJ2EEVersionToModuleVersion(j2eeVersion);
- }
-
- protected EClass getComponentType() {
- return CommonarchiveFactoryImpl.getPackage().getEJBJarFile();
- }
-
- protected String getComponentExtension() {
- return ".jar"; //$NON-NLS-1$
- }
-
- public boolean isPropertyEnabled(String propertyName) {
- if (USE_ANNOTATIONS.equals(propertyName)) {
- if (getJ2EEVersion() < J2EEVersionConstants.VERSION_1_3)
- return false;
- return true;
- }
- if (CREATE_CLIENT.equals(propertyName)) {
- if (getBooleanProperty(ADD_TO_EAR))
- return true;
- return false;
- }
- return super.isPropertyEnabled(propertyName);
- }
-
- public DataModelPropertyDescriptor[] getValidPropertyDescriptors(String propertyName) {
- return super.getValidPropertyDescriptors(propertyName);
- }
-
- protected String getJ2EEProjectType() {
- return J2EEProjectUtilities.EJB;
- }
-}
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 df88c4d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/IEjbClientProjectCreationDataModelProperties.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.archiveoperations;
-
-import org.eclipse.jst.j2ee.project.facet.IJavaUtilityProjectCreationDataModelProperties;
-
-public interface IEjbClientProjectCreationDataModelProperties extends IJavaUtilityProjectCreationDataModelProperties{
-
- 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/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 5024a83..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/componentcore/util/EJBArtifactEdit.java
+++ /dev/null
@@ -1,540 +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.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.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.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.ejb.archiveoperations.EJBComponentLoadStrategyImpl;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.UnresolveableURIException;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
-import org.eclipse.wst.common.componentcore.internal.util.IArtifactEditFactory;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-
-/**
- * <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 {
-
- /**
- * <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();
- }
-
- /**
- * @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() {
- 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().removeLastSegments(1).toOSString();
- else
- modulePath = getDeploymentDescriptorFolder().getProjectRelativePath().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() {
- return getEJBJarXmiResource().getJ2EEVersionID();
- }
-
- /**
- * <p>
- * Checks is a EJB Client Jar exists for the ejb module project
- * </p>
- *
- * @return boolean
- *
- */
-
- public boolean hasEJBClientJARProject() {
-
- if (getEJBClientJarModule() != null)
- return true;
- return false;
- }
-
- /**
- * <p>
- * Creates a new EJB module
- * </p>
- *
- * @return
- */
- public Module createNewModule() {
- return ((ApplicationPackage) EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI)).getApplicationFactory().createEjbModule();
- }
-
-
- /**
- * @param project
- * @return WorkbenchComponent
- */
- public IVirtualComponent getEJBClientJarModule() {
- 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() {
- return getArtifactEditModel().getResource(J2EEConstants.EJBJAR_DD_URI_OBJ);
- }
-
- /**
- *
- * @return EJBJar from (@link getDeploymentDescriptorRoot())
- *
- */
- public EJBJar getEJBJar() {
- 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() {
- List contents = getDeploymentDescriptorResource().getContents();
- if (contents.size() > 0)
- return (EObject) contents.get(0);
- 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 (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 {
- 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);
- } 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);
- } 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) {
- try {
- if (isValidEJBModule(aModule)) {
- IProject project = aModule.getProject();
- ModuleCoreNature nature = ModuleCoreNature.getModuleCoreNature(project);
- return new EJBArtifactEdit(nature, aModule, true);
- }
- } catch (UnresolveableURIException uue) {
- // Ignore
- }
- return null;
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the given
- * {@see WorkbenchComponent}. Instances of EJBArtifactEdit that are returned through this
- * method must be {@see #dispose()}ed of when no longer in use.
- * </p>
- * <p>
- * Use to acquire an 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) {
- try {
- if (isValidEJBModule(aModule)) {
- IProject project = aModule.getProject();
- ModuleCoreNature nature = ModuleCoreNature.getModuleCoreNature(project);
- return new EJBArtifactEdit(nature, aModule, false);
- }
- } catch (UnresolveableURIException uue) {
- // Ignore
- }
- return null;
- }
-
- /**
- * @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() {
- return createModelRoot(getJ2EEVersion());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.modulecore.util.EnterpriseArtifactEdit#createModelRoot(int)
- */
- public EObject createModelRoot(int version) {
- 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) throws OpenFailureException{
- EJBComponentLoadStrategyImpl loader = new EJBComponentLoadStrategyImpl(getComponent());
- loader.setExportSource(includeSource);
- String uri = ModuleURIUtil.getHandleString(getComponent());
- return CommonarchiveFactory.eINSTANCE.openEJBJarFile(loader, uri);
- }
-
- public static void createDeploymentDescriptor(IProject project, int version) {
- EJBArtifactEdit ejbEdit = new EJBArtifactEdit(project,false,true);
- try {
- ejbEdit.createModelRoot(version);
- ejbEdit.save(null);
- } finally {
- ejbEdit.dispose();
- }
- }
-}
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 fc10081..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/project/facet/EjbFacetInstallDelegate.java
+++ /dev/null
@@ -1,413 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.project.facet;
-
-
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.common.project.facet.WtpUtils;
-import org.eclipse.jst.common.project.facet.core.ClasspathHelper;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationOp;
-import org.eclipse.jst.j2ee.application.internal.operations.IAddComponentToEnterpriseApplicationDataModelProperties;
-import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProperties;
-import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProvider;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EJBJarImpl;
-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.common.operations.JARDependencyDataModelProperties;
-import org.eclipse.jst.j2ee.internal.common.operations.JARDependencyDataModelProvider;
-import org.eclipse.jst.j2ee.internal.ejb.archiveoperations.EjbClientProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.IEjbFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.J2EEFacetInstallDelegate;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.FacetDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.operation.CreateReferenceComponentsDataModelProvider;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-
-public class EjbFacetInstallDelegate extends J2EEFacetInstallDelegate implements IDelegate {
-
- public void execute(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor) throws CoreException {
-
- if (monitor != null) {
- monitor.beginTask("", 1);
- }
-
- try {
- IDataModel model = (IDataModel) config;
-
- final IJavaProject jproj = JavaCore.create(project);
-
- // Add WTP natures.
-
- WtpUtils.addNatures(project);
-
- // Create the directory structure.
-
- final IWorkspace ws = ResourcesPlugin.getWorkspace();
- final IPath pjpath = project.getFullPath();
-
- // Setup the flexible project structure.
-
- final IVirtualComponent c = ComponentCore.createComponent(project);
-
- c.create(0, null);
-
- c.setMetaProperty("java-output-path", "/build/classes/");
-
-
- final IVirtualFolder ejbroot = c.getRootFolder();
-
- 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);
- }
- }
-
- IFolder ejbFolder = null;
- String configFolder = null;
-
- configFolder = model.getStringProperty(IEjbFacetInstallDataModelProperties.CONFIG_FOLDER);
- ejbroot.createLink(new Path("/" + configFolder), 0, null);
-
- String ejbFolderName = model.getStringProperty(IEjbFacetInstallDataModelProperties.CONFIG_FOLDER);
- IPath ejbFolderpath = pjpath.append(ejbFolderName);
-
- ejbFolder = ws.getRoot().getFolder(ejbFolderpath);
-
-
- 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);
- }
-
- try {
- createManifest(project, ejbFolder, monitor);
- } catch (InvocationTargetException e) {
- Logger.getLogger().logError(e);
- } catch (InterruptedException e) {
- Logger.getLogger().logError(e);
- }
-
- // Setup the classpath.
- ClasspathHelper.removeClasspathEntries(project, fv);
-
- if (!ClasspathHelper.addClasspathEntries(project, fv)) {
- // TODO: Support the no runtime case.
- // ClasspathHelper.addClasspathEntries( project, fv, <something> );
- }
-
- // Associate with an EAR, if necessary.
-
- final String earProjectName = (String) model.getProperty(IEjbFacetInstallDataModelProperties.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));
-
- IFacetedProject facetedProject = ProjectFacetsManager.create(project);
- installEARFacet(j2eeVersionText, earProjectName, facetedProject.getRuntime(), monitor);
-
- IProject earProject = ProjectUtilities.getProject(earProjectName);
- IVirtualComponent earComp = ComponentCore.createComponent(earProject);
-
- final IDataModel dataModel = DataModelFactory.createDataModel(new AddComponentToEnterpriseApplicationDataModelProvider() {
- public Object getDefaultProperty(String propertyName) {
- if (IAddComponentToEnterpriseApplicationDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP.equals(propertyName)) {
- Map map = new HashMap();
- List components = (List) getProperty(TARGET_COMPONENT_LIST);
- for (int i = 0; i < components.size(); i++) {
- IVirtualComponent component = (IVirtualComponent) components.get(i);
- String name = component.getName();
- name += ".jar"; //$NON-NLS-1$
- map.put(component, name);
- }
- return map;
- }
- return super.getDefaultProperty(propertyName);
- }
-
- public IDataModelOperation getDefaultOperation() {
- return new AddComponentToEnterpriseApplicationOp(model) {
- protected Module createNewModule(IVirtualComponent wc) {
- return ((ApplicationPackage) EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI)).getApplicationFactory().createEjbModule();
- }
- };
- }
- });
-
- dataModel.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComp);
- List modList = (List) dataModel.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
- modList.add(c);
- dataModel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, modList);
- try {
- dataModel.getDefaultOperation().execute(null, null);
- } catch (ExecutionException e) {
- Logger.getLogger().logError(e);
- }
-
- }
-
-
- // 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 != "") {
- 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(IEjbFacetInstallDataModelProperties.FACET_RUNTIME);
- try {
-
- IDataModel dm = DataModelFactory.createDataModel(new EjbClientProjectCreationDataModelProvider());
-
- dm.setStringProperty(EjbClientProjectCreationDataModelProvider.PROJECT_NAME, clientProjectName);
-
- dm.setStringProperty(EjbClientProjectCreationDataModelProvider.EJB_PROJECT_NAME, model.getStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME));
-
- dm.setStringProperty(EjbClientProjectCreationDataModelProvider.EAR_PROJECT_NAME, earProjectName);
-
- dm.setStringProperty(EjbClientProjectCreationDataModelProvider.SOURCE_FOLDER, (String) model.getProperty(IEjbFacetInstallDataModelProperties.CLIENT_SOURCE_FOLDER));
-
- dm.setProperty(EjbClientProjectCreationDataModelProvider.RUNTIME, rt);
-
-
- dm.getDefaultOperation().execute(monitor, null);
-
-
- } catch (Exception e) {
- Logger.getLogger().logError(e);
- }
-
- if (createClient && clientProjectName != null && clientProjectName != "") {
- 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();
- }
- }
-
- }
-
-
- }
-
- 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();
- }
- }
- }
-
-
- protected void runAddClientToEAROperation(IDataModel model, IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException {
-
- final String earProjectName = (String) model.getProperty(IEjbFacetInstallDataModelProperties.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);
- 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();
-
-
-
- String clientProjectName = model.getStringProperty(IEjbFacetInstallDataModelProperties.CLIENT_NAME);
-
- 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(clientProjectName + ".jar"));//$NON-NLS-1$
-
-
- try {
- updateManifestDataModel.getDefaultOperation().execute(aMonitor, null);
- } catch (Exception e) {
- Logger.getLogger().logError(e);
- }
-
- if (!clientProjectName.equals(ejbprojectName)) {
- IDataModel dataModel = DataModelFactory.createDataModel(new JARDependencyDataModelProvider());
- dataModel.setProperty(JARDependencyDataModelProperties.PROJECT_NAME, ejbprojectName);
- dataModel.setProperty(JARDependencyDataModelProperties.REFERENCED_PROJECT_NAME, clientProjectName);
- dataModel.setIntProperty(JARDependencyDataModelProperties.JAR_MANIPULATION_TYPE, JARDependencyDataModelProperties.JAR_MANIPULATION_ADD);
- try {
- dataModel.getDefaultOperation().execute(aMonitor, null);
- } catch (Exception e) {
- Logger.getLogger().logError(e);
- }
- }
- }
-
-
- private void updateEJBDD(IDataModel model, IProgressMonitor monitor) {
-
- String ejbprojectName = model.getStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME);
- IProject ejbProj = ProjectUtilities.getProject(ejbprojectName);
-
-
- String clientProjectName = model.getStringProperty(IEjbFacetInstallDataModelProperties.CLIENT_NAME);
-
- IVirtualComponent c = ComponentCore.createComponent(ejbProj);
- Properties props = c.getMetaProperties();
-
- String clienturi = props.getProperty(CreationConstants.CLIENT_JAR_URI);
-
- EJBArtifactEdit ejbEdit = null;
- try {
- ejbEdit = new EJBArtifactEdit(ejbProj, false, true);
-
- if (ejbEdit != null) {
- EJBJarImpl ejbres = (EJBJarImpl) ejbEdit.getDeploymentDescriptorRoot();
- if (clienturi != null && !clienturi.equals("")) {
- ejbres.setEjbClientJar(clienturi);//$NON-NLS-1$
- } else
- ejbres.setEjbClientJar(clientProjectName + ".jar");//$NON-NLS-1$
- ejbres.setEjbClientJar(clienturi);//$NON-NLS-1$
- ejbEdit.saveIfNecessary(monitor);
- }
- } catch (Exception e) {
- Logger.getLogger().logError(e);
- } finally {
- if (ejbEdit != null)
- ejbEdit.dispose();
- }
- }
-}
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/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/EJBGenHelpers.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/EJBGenHelpers.java
deleted file mode 100644
index ead5b5e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/EJBGenHelpers.java
+++ /dev/null
@@ -1,437 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-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.jdom.IDOMMethod;
-import org.eclipse.jem.internal.adapters.jdom.JDOMAdaptor;
-import org.eclipse.jem.internal.adapters.jdom.JavaClassJDOMAdaptor;
-import org.eclipse.jem.internal.adapters.jdom.JavaMethodJDOMAdaptor;
-import org.eclipse.jem.internal.java.adapters.ReadAdaptor;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.common.jdt.internal.integration.WorkingCopyProvider;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.MethodElement;
-import org.eclipse.jst.j2ee.ejb.QueryMethod;
-import org.eclipse.jst.j2ee.internal.EjbModuleExtensionHelper;
-import org.eclipse.jst.j2ee.internal.IEJBModelExtenderManager;
-import org.eclipse.wst.validation.internal.operations.EnabledValidatorsOperation;
-import org.eclipse.wst.validation.internal.operations.ValidatorManager;
-
-/**
- * Insert the type's description here. Creation date: (10/12/00 10:20:00 PM)
- *
- * @author: Steve Wasleski
- */
-public final class EJBGenHelpers {
- // Navigator keys
-// private static final String ENTITY_KEY_ATTRIBUTE_FIELDS_AS_PARMS = "EntityKeyAttributeFieldsAsParms"; //$NON-NLS-1$
-// private static final String ENTITY_KEY_ROLE_FIELDS_AS_ROUND_PARMS = "EntityKeyRoleFieldsAsRoundParms"; //$NON-NLS-1$
-// private static final String ENTITY_KEY_ROLE_FIELDS_AS_BEAN_PARMS = "EntityKeyRoleFieldsAsBeanParms"; //$NON-NLS-1$
-// private static final String ENTITY_NONKEY_REQUIRED_ATTRIBUTE_FIELDS_AS_PARMS = "EntityNonKeyRequiredAttributeFieldsAsParms"; //$NON-NLS-1$
-// private static final String ENTITY_NON_KEY_REQ_ROLE_FIELDS_AS_BEAN_PARMS = "EntityNonKeyRequiredRoleFieldsAsBeanParms"; //$NON-NLS-1$
-// private static final String ENTITY_KEY_FIELDS_AS_FLAT_PARMS = "EntityKeyFieldsAsFlatParms"; //$NON-NLS-1$
-// private static final String ENTITY_KEY_FIELDS_AS_ROUND_PARMS = "EntityKeyFieldsAsRoundParms"; //$NON-NLS-1$
-// private static final String ENTITY_KEY_FIELDS_AS_BEAN_PARMS = "EntityKeyFieldsAsBeanParms"; //$NON-NLS-1$
-// private static final String ENTITY_REQ_ROLE_FIELDS_AS_FLAT_PARMS = "EntityRequiredRoleFieldsAsFlatParms"; //$NON-NLS-1$
-// private static final String ENTITY_REQ_ROLE_FIELDS_AS_ROUND_PARMS = "EntityRequiredRoleFieldsAsRoundParms"; //$NON-NLS-1$
-// private static final String ENTITY_REQ_ROLE_FIELDS_AS_BEAN_PARMS = "EntityRequiredRoleFieldsAsBeanParms"; //$NON-NLS-1$
-// private static final String ENTITY_REQ_FIELDS_AS_FLAT_PARMS = "EntityRequiredFieldsAsFlatParms"; //$NON-NLS-1$
-// private static final String ENTITY_REQ_FIELDS_AS_ROUND_PARMS = "EntityRequiredFieldsAsRoundParms"; //$NON-NLS-1$
-// private static final String ENTITY_REQ_FIELDS_AS_BEAN_PARMS = "EntityRequiredFieldsAsBeanParms"; //$NON-NLS-1$
-
- private static final String A = "a"; //$NON-NLS-1$
- private static final String AN = "an"; //$NON-NLS-1$
- private static final char[] VOWELS = new char[]{'A', 'a', 'E', 'e', 'I', 'i', 'O', 'o', 'U', 'u'};
-
- /**
- * EJBGenHelpers constructor comment.
- */
- private EJBGenHelpers() {
- super();
- }
-
- /**
- * Add a vowel prefix to
- *
- * @aString.
- */
- public static final String asParameterName(String aString) {
- String name = firstAsUppercase(aString);
- name = withVowelPrefix(name);
- return name;
- }
-
- /**
- * Return aString where the first character is uppercased.
- */
- public static final String firstAsUppercase(String aString) {
- if (aString != null && aString.length() > 0 && !Character.isUpperCase(aString.charAt(0))) {
- char[] chars = aString.toCharArray();
- chars[0] = Character.toUpperCase(chars[0]);
- return String.valueOf(chars);
- }
- return aString;
- }
-
- protected static EjbModuleExtensionHelper getEJBModuleExtension() {
- return IEJBModelExtenderManager.INSTANCE.getEJBModuleExtension(null);
- }
-
- /**
- * Returns the primitive wrapper for the type.
- */
- public final static String getPrimitiveWrapper(String type) {
- if (type.equals("boolean")) //$NON-NLS-1$
- return "java.lang.Boolean"; //$NON-NLS-1$
- if (type.equals("byte")) //$NON-NLS-1$
- return "java.lang.Byte"; //$NON-NLS-1$
- if (type.equals("char")) //$NON-NLS-1$
- return "java.lang.Character"; //$NON-NLS-1$
- if (type.equals("short")) //$NON-NLS-1$
- return "java.lang.Short"; //$NON-NLS-1$
- if (type.equals("int")) //$NON-NLS-1$
- return "java.lang.Integer"; //$NON-NLS-1$
- if (type.equals("long")) //$NON-NLS-1$
- return "java.lang.Long"; //$NON-NLS-1$
- if (type.equals("float")) //$NON-NLS-1$
- return "java.lang.Float"; //$NON-NLS-1$
- if (type.equals("double")) //$NON-NLS-1$
- return "java.lang.Double"; //$NON-NLS-1$
- return null;
- }
-
- /**
- * Returns the primitive wrapper for the type.
- */
- public final static String getPrimitiveWrapperShortName(String type) {
- if (type.equals("boolean")) //$NON-NLS-1$
- return "Boolean"; //$NON-NLS-1$
- if (type.equals("byte")) //$NON-NLS-1$
- return "Byte"; //$NON-NLS-1$
- if (type.equals("char")) //$NON-NLS-1$
- return "Character"; //$NON-NLS-1$
- if (type.equals("short")) //$NON-NLS-1$
- return "Short"; //$NON-NLS-1$
- if (type.equals("int")) //$NON-NLS-1$
- return "Integer";//$NON-NLS-1$
- if (type.equals("long")) //$NON-NLS-1$
- return "Long"; //$NON-NLS-1$
- if (type.equals("float")) //$NON-NLS-1$
- return "Float"; //$NON-NLS-1$
- if (type.equals("double")) //$NON-NLS-1$
- return "Double"; //$NON-NLS-1$
- return null;
- }
-
- /**
- * Returns true if the type is a primitive.
- */
- public final static boolean isPrimitive(String type) {
- return (type.equals("boolean") //$NON-NLS-1$
- || type.equals("byte") //$NON-NLS-1$
- || type.equals("char") //$NON-NLS-1$
- || type.equals("short") //$NON-NLS-1$
- || type.equals("int") //$NON-NLS-1$
- || type.equals("long") //$NON-NLS-1$
- || type.equals("float") //$NON-NLS-1$
- || type.equals("double")); //$NON-NLS-1$
- }
-
- public static boolean isRoot(EnterpriseBean anEJB) {
- if (anEJB != null) {
- EnterpriseBean superType = getSupertype(anEJB);
- if (superType == null)
- return true;
- }
- return false;
- }
-
- protected static EnterpriseBean getSupertype(EnterpriseBean ejb) {
- EjbModuleExtensionHelper helper = getEjbModuleExtension();
- if (helper != null)
- return helper.getSuperType(ejb);
- return null;
- }
-
- protected static EjbModuleExtensionHelper getEjbModuleExtension() {
- return IEJBModelExtenderManager.INSTANCE.getEJBModuleExtension(null);
- }
-
- /**
- * Return aString where with a prefixed vowel (a or an).
- */
- public static final boolean isVowel(char aChar) {
- for (int i = 0; i < VOWELS.length; i++) {
- if (aChar == VOWELS[i])
- return true;
- }
- return false;
- }
-
- /**
- * Return aString where with a prefixed vowel (a or an).
- */
- public static final String withVowelPrefix(String aString) {
- if (aString != null && aString.length() > 0) {
- char first = aString.charAt(0);
- if (isVowel(first))
- return AN + aString;
- return A + aString;
- }
- return aString;
- }
-
- /**
- * Method isArray.
- *
- * @param type
- * @return boolean
- */
- public static boolean isArray(String type) {
- if (type != null && type.length() > 0) {
- int index = type.indexOf('[');
- return index > -1;
- }
- return false;
- }
-
- public static ICompilationUnit getCompilationUnit(JavaClass javaClass) {
- IType type = getType(javaClass);
- if (type != null)
- return type.getCompilationUnit();
- return null;
- }
-
- public static IType getType(JavaClass javaClass) {
- if (javaClass != null) {
- JavaClassJDOMAdaptor adaptor = (JavaClassJDOMAdaptor) EcoreUtil.getRegisteredAdapter(javaClass, ReadAdaptor.TYPE_KEY);
- if (adaptor != null)
- return adaptor.getSourceType();
- }
- return null;
- }
-
- public static IMethod getMethod(Method javaMethod) {
- if (javaMethod != null) {
- JavaMethodJDOMAdaptor adaptor = (JavaMethodJDOMAdaptor) EcoreUtil.getRegisteredAdapter(javaMethod, ReadAdaptor.TYPE_KEY);
- if (adaptor != null)
- return adaptor.getSourceMethod();
- }
- return null;
- }
-
- public static ICompilationUnit getWorkingCopy(JavaClass javaClass, WorkingCopyProvider provider, Object shell) throws org.eclipse.core.runtime.CoreException {
- ICompilationUnit cu = getCompilationUnit(javaClass);
- IStatus status = validateEdit(cu, shell);
- if (cu != null && (status == null || status.isOK()))
- return provider.getWorkingCopy(cu, false);
- return null;
- }
-
- public static IMethod getMethod(MethodElement me, WorkingCopyProvider provider, Map typeCache, Object shell) throws CoreException {
- return getMethod(me, provider, typeCache, shell, true);
- }
-
- public static IMethod getMethod(MethodElement me, WorkingCopyProvider provider, Map typeCache, Object shell, boolean useWorkingCopy) throws CoreException {
- if (me != null)
- return getMethod(me, me.getTypeJavaClass(), provider, typeCache, shell, useWorkingCopy);
- return null;
- }
-
- public static IMethod getMethod(MethodElement me, JavaClass typeClass, WorkingCopyProvider provider, Object shell, Map typeCache) throws CoreException {
- return getMethod(me, typeClass, provider, typeCache, shell, false);
- }
-
- public static IMethod getMethod(MethodElement me, JavaClass typeClass, WorkingCopyProvider provider, Map typeCache, Object shell, boolean useWorkingCopy) throws CoreException {
- IMethod method = null;
- if (me != null) {
- IType type = getType(typeClass);
- if (type == null)
- return null;
- if (type.isBinary() || !useWorkingCopy)
- method = getMethod(me, type, typeCache);
- if (method == null) {
- ICompilationUnit cu = getWorkingCopy(typeClass, provider, shell);
- if (cu != null)
- method = getMethod(me, cu.findPrimaryType(), typeCache);
- }
- }
- return method;
- }
-
- private static IMethod getMethod(MethodElement me, IType type, Map typeCache) throws CoreException {
- IMethod[] children = type.getMethods();
- IMethod method;
- for (int i = 0; i < children.length; i++) {
- method = children[i];
- if (method.getElementName().equals(me.getName())) {
- String[] typeNames = method.getParameterTypes();
- List parms = me.getMethodParams();
- if (typeNames.length != parms.size())
- continue;
- String parm;
- String resolvedName;
- boolean isMatch = true;
- for (int j = 0; j < typeNames.length; j++) {
- parm = (String) parms.get(j);
- resolvedName = JDOMAdaptor.typeNameFromSignature(typeNames[j], type, typeCache);
- if (!resolvedName.equals(parm)) {
- isMatch = false;
- break;
- }
- }
- if (isMatch)
- return method;
- }
- }
- return null;
- }
-
- public static IMethod[] getMethods(QueryMethod query, WorkingCopyProvider provider, Map typeCache, Object shell) throws CoreException {
- return getMethods(query, provider, typeCache, shell, false);
- }
-
- public static IMethod[] getMethods(QueryMethod query, WorkingCopyProvider provider, Map typeCache, Object shell, boolean useWorkingCopy) throws CoreException {
- if (query != null) {
- JavaClass[] typeClasses = query.getClientTypeJavaClasses();
- if (typeClasses.length == 1)
- return new IMethod[]{getMethod(query, provider, typeCache, shell, useWorkingCopy)};
- List methods = new ArrayList(4);
- IMethod method;
- for (int i = 0; i < typeClasses.length; i++) {
- method = getMethod(query, typeClasses[i], provider, typeCache, shell, useWorkingCopy);
- if (method != null)
- methods.add(method);
- }
- IMethod[] result = new IMethod[methods.size()];
- methods.toArray(result);
- return result;
- }
- return null;
- }
-
- public static String typeNameFromSignature(String sig, IMethod method, Map typeCache) {
- if (sig != null && method != null) {
- IType type = method.getDeclaringType();
- if (type != null)
- return JDOMAdaptor.typeNameFromSignature(sig, type, typeCache);
- }
- return null;
- }
-
- /**
- * The sourceMethod will be updated with the contents from the updateMethod. If the signature
- * has changed, the sourceMethod will be updated.
- */
- public static void editMethod(IMethod sourceMethod, IDOMMethod updateMethod, WorkingCopyProvider provider, Object shell) throws JavaModelException, CoreException {
- if (sourceMethod != null && updateMethod != null && !sourceMethod.isBinary()) {
- IMethod wcMethod = getWorkingCopyMethod(sourceMethod, provider, shell);
- IType type = wcMethod.getDeclaringType();
- IJavaElement sibling = getSibling(wcMethod, type);
- String formattedSource = ToolFactory.createCodeFormatter().format(updateMethod.getContents(), 1, null, null) + "\n"; //$NON-NLS-1$
- wcMethod.delete(true, null);
- type.createMethod(formattedSource, sibling, true, null);
- }
- }
-
- public static void editMethods(IMethod[] sourceMethods, IDOMMethod[] updateMethods, WorkingCopyProvider provider, Object shell) throws JavaModelException, CoreException {
- if (sourceMethods != null) {
- for (int i = 0; i < sourceMethods.length; i++) {
- editMethod(sourceMethods[i], updateMethods[i], provider, shell);
- }
- }
- }
-
- public static IMethod getWorkingCopyMethod(IMethod sourceMethod, WorkingCopyProvider provider, Object shell) throws CoreException {
- if (sourceMethod != null && provider != null) {
- ICompilationUnit cu = sourceMethod.getCompilationUnit();
- IStatus status = validateEdit(cu, shell);
- if (!cu.isWorkingCopy() && (status == null || status.isOK())) {
- ICompilationUnit wc = provider.getWorkingCopy(sourceMethod.getCompilationUnit(), false);
- IType type = wc.findPrimaryType();
- IMethod[] methods = type.findMethods(sourceMethod);
- if (methods.length > 0 && methods[0] != null)
- return methods[0];
- }
- }
- return sourceMethod;
- }
-
- public static IJavaElement getSibling(IMethod sourceMethod, IType type) throws JavaModelException {
- if (sourceMethod != null && type != null) {
- IJavaElement[] elements = type.getChildren();
- int max = elements.length - 1;
- for (int i = 0; i < elements.length; i++) {
- if (elements[i] == sourceMethod && i != max)
- return elements[i + 1];
- }
- }
- return null;
- }
-
- public static IStatus validateEdit(ICompilationUnit cu, Object obj) {
- if (cu != null && !cu.isWorkingCopy()) {
- try {
- IResource res = cu.getUnderlyingResource();
- if (res.getType() == IResource.FILE && res.isReadOnly())
- return ResourcesPlugin.getWorkspace().validateEdit(new IFile[]{(IFile) res}, obj);
- } catch (JavaModelException e) {
- Logger.getLogger().logError(e);
- }
- }
- return null;
- }
-
- public static void runWithJavaCoreWithDelayedValidation(IWorkspaceRunnable workspaceRunnable, IProject project) {
- boolean needsSuspending = !ValidatorManager.getManager().isSuspended(project);
- try {
- if (needsSuspending) {
- ValidatorManager.getManager().suspendValidation(project, true);
- }
- JavaCore.run(workspaceRunnable, null);
- } catch (CoreException ex) {
- Logger.getLogger().logError(ex);
- } finally {
- if (needsSuspending) {
- ValidatorManager.getManager().suspendValidation(project, false);
- }
- }
-
- if (needsSuspending) {
- EnabledValidatorsOperation validationOperation = new EnabledValidatorsOperation(project, true);
- validationOperation.run(new NullProgressMonitor());
- }
- }
-
-}
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 e4cdd7a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EJBComponentImportDataModelProvider.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.project.operations;
-
-import java.util.List;
-
-import org.eclipse.jst.j2ee.application.internal.operations.ExtendedImportFactory;
-import org.eclipse.jst.j2ee.application.internal.operations.ExtendedImportRegistry;
-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.ejb.datamodel.properties.IEjbComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.internal.ejb.archiveoperations.EJBComponentImportOperation;
-import org.eclipse.jst.j2ee.internal.ejb.archiveoperations.EjbComponentCreationDataModelProvider;
-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 {
- OpenFailureException cachedException = null;
- Archive archive = null;
- try {
- archive = CommonarchiveFactory.eINSTANCE.openEJBJarFile(getArchiveOptions(), uri);
- } catch (OpenFailureException e) {
- cachedException = e;
- }
- if (archive == null) {
- List extendedFactories = ExtendedImportRegistry.getInstance().getFactories(ExtendedImportRegistry.EJB_TYPE);
- for (int i = 0; null == getArchiveFile() && i < extendedFactories.size(); i++) {
- ExtendedImportFactory factory = (ExtendedImportFactory) extendedFactories.get(i);
- setArchiveFile(factory.openArchive(getArchiveOptions(), uri));
- setProperty(EXTENDED_IMPORT_FACTORY, factory);
- }
- }
- if (archive == null) {
- if (cachedException != null) {
- throw cachedException;
- }
- }
- return archive;
- }
-
- public IDataModelOperation getDefaultOperation() {
- return new EJBComponentImportOperation(model);
- }
-
- protected IDataModel createJ2EEComponentCreationDataModel() {
- IDataModel ejbCreationDM = DataModelFactory.createDataModel(new EjbComponentCreationDataModelProvider());
- ejbCreationDM.setBooleanProperty(IEjbComponentCreationDataModelProperties.CREATE_CLIENT, false);
- return ejbCreationDM;
- }
-}
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 11672a4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EJBCreationResourceHandler.java
+++ /dev/null
@@ -1,180 +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.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 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;
-
- 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$
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EjbComponentCreationFacetOperation.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EjbComponentCreationFacetOperation.java
deleted file mode 100644
index 1188f27..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EjbComponentCreationFacetOperation.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.project.operations;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-import java.util.Properties;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.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.datamodel.properties.IJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJavaComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.j2ee.ejb.datamodel.properties.IEJBClientComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.ejb.datamodel.properties.IEjbComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EJBJarImpl;
-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.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.J2EEComponentCreationFacetOperation;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.FacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IComponentCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
-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;
-
-public class EjbComponentCreationFacetOperation extends J2EEComponentCreationFacetOperation {
-
-
- public EjbComponentCreationFacetOperation(IDataModel model) {
- super(model);
- }
-
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- IDataModel dm = DataModelFactory.createDataModel(new FacetProjectCreationDataModelProvider());
- String projectName = model.getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME);
- dm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, projectName);
- FacetDataModelMap facetDMs = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- facetDMs.add(setupJavaInstallAction());
- IDataModel newModel = setupEjbInstallAction();
- facetDMs.add(newModel);
- setRuntime(newModel, dm); // Setting runtime property
- IStatus stat = dm.getDefaultOperation().execute(monitor, info);
-
- if (stat.isOK() && model.getBooleanProperty(IJ2EEComponentCreationDataModelProperties.ADD_TO_EAR)) {
- String earProjectName = (String) model.getProperty(IJ2EEComponentCreationDataModelProperties.EAR_COMPONENT_NAME);
- IProject earProject = ProjectUtilities.getProject(earProjectName);
- if (earProject != null && earProject.exists())
- stat = addtoEar(projectName, earProjectName);
- }
-
- final boolean createClient = model.getBooleanProperty(IEjbComponentCreationDataModelProperties.CREATE_CLIENT);
- IDataModel ejbClientComponentDataModel = (IDataModel) model.getProperty(IEjbComponentCreationDataModelProperties.NESTED_MODEL_EJB_CLIENT_CREATION);
- String clientProjectName = ejbClientComponentDataModel.getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME);
-
-
- if (createClient && clientProjectName != null && clientProjectName != "") {
- try {
- runAddClientToEAROperation(monitor);
- runAddClientToEJBOperation(monitor);
- modifyEJBModuleJarDependency(monitor);
- updateEJBDD(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();
- }
-
- }
-
-
- return stat;
- }
-
- protected IDataModel setupEjbInstallAction() {
- String versionStr = model.getPropertyDescriptor(IJ2EEComponentCreationDataModelProperties.COMPONENT_VERSION).getPropertyDescription();
- IDataModel ejbFacetInstallDataModel = DataModelFactory.createDataModel(new EjbFacetInstallDataModelProvider());
- ejbFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, model.getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME));
- ejbFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, versionStr);
- ejbFacetInstallDataModel.setProperty(IEjbFacetInstallDataModelProperties.CONFIG_FOLDER, model.getStringProperty(IJavaComponentCreationDataModelProperties.JAVASOURCE_FOLDER));
- ejbFacetInstallDataModel.setBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR,model.getBooleanProperty(IJ2EEComponentCreationDataModelProperties.ADD_TO_EAR));
- if (model.getBooleanProperty(IJ2EEComponentCreationDataModelProperties.ADD_TO_EAR))
- ejbFacetInstallDataModel.setProperty(IEjbFacetInstallDataModelProperties.EAR_PROJECT_NAME, model.getProperty(IJ2EEComponentCreationDataModelProperties.EAR_COMPONENT_NAME));
-
- ejbFacetInstallDataModel.setProperty(IEjbFacetInstallDataModelProperties.CREATE_CLIENT, model.getProperty(IEjbComponentCreationDataModelProperties.CREATE_CLIENT));
-
- IDataModel ejbClientComponentDataModel = (IDataModel) model.getProperty(IEjbComponentCreationDataModelProperties.NESTED_MODEL_EJB_CLIENT_CREATION);
-
- ejbFacetInstallDataModel.setProperty(IEjbFacetInstallDataModelProperties.CLIENT_NAME, ejbClientComponentDataModel.getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME));
-
- ejbFacetInstallDataModel.setProperty(IEjbFacetInstallDataModelProperties.CLIENT_SOURCE_FOLDER, model.getStringProperty(IJavaComponentCreationDataModelProperties.JAVASOURCE_FOLDER));
- ejbFacetInstallDataModel.setProperty(IEjbFacetInstallDataModelProperties.CLIENT_URI,
- ejbClientComponentDataModel.getStringProperty(IEJBClientComponentCreationDataModelProperties.CLIENT_COMPONENT_URI));
-
- ejbFacetInstallDataModel.setProperty(IJ2EEModuleFacetInstallDataModelProperties.RUNTIME_TARGET_ID, model.getProperty(IJ2EEComponentCreationDataModelProperties.RUNTIME_TARGET_ID));
-
- return ejbFacetInstallDataModel;
- }
-
- protected void runAddClientToEAROperation(IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException {
-
-
- String earProjectName = (String) model.getProperty(IJ2EEComponentCreationDataModelProperties.EAR_COMPONENT_NAME);
- IProject earproject = ProjectUtilities.getProject(earProjectName);
-
- IVirtualComponent earComp = ComponentCore.createComponent(earproject);
-
-
- IDataModel ejbClientComponentDataModel = (IDataModel) model.getProperty(IEjbComponentCreationDataModelProperties.NESTED_MODEL_EJB_CLIENT_CREATION);
- String clientProjectName = ejbClientComponentDataModel.getStringProperty(IComponentCreationDataModelProperties.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);
- try {
- dm.getDefaultOperation().execute(monitor, null);
- } catch (ExecutionException e) {
- Logger.getLogger().log(e);
- }
- }
- }
-
-
- protected void runAddClientToEJBOperation(IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException {
-
- String projectName = model.getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME);
- IProject ejbProj = ProjectUtilities.getProject(projectName);
- IVirtualComponent ejbcomponent = ComponentCore.createComponent(ejbProj);
-
- IDataModel ejbClientComponentDataModel = (IDataModel) model.getProperty(IEjbComponentCreationDataModelProperties.NESTED_MODEL_EJB_CLIENT_CREATION);
- String clientProjectName = ejbClientComponentDataModel.getStringProperty(IComponentCreationDataModelProperties.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(IProgressMonitor aMonitor) throws InvocationTargetException, InterruptedException {
-
-
- String projectName = model.getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME);
- IProject ejbProj = ProjectUtilities.getProject(projectName);
- IVirtualComponent ejbComponent = ComponentCore.createComponent(ejbProj);
- IVirtualFile vf = ejbComponent.getRootFolder().getFile(new Path(J2EEConstants.MANIFEST_URI));
- IFile manifestmf = vf.getUnderlyingFile();
-
-
- IDataModel ejbClientComponentDataModel = (IDataModel) model.getProperty(IEjbComponentCreationDataModelProperties.NESTED_MODEL_EJB_CLIENT_CREATION);
- String clientProjectName = ejbClientComponentDataModel.getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME);
-
-
- IDataModel updateManifestDataModel = DataModelFactory.createDataModel(UpdateManifestDataModelProvider.class);
- updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.PROJECT_NAME, projectName);
- updateManifestDataModel.setBooleanProperty(UpdateManifestDataModelProperties.MERGE, false);
- updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.MANIFEST_FILE, manifestmf);
- updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.JAR_LIST, UpdateManifestDataModelProvider.convertClasspathStringToList(clientProjectName + ".jar"));//$NON-NLS-1$
-
-
- try {
- updateManifestDataModel.getDefaultOperation().execute(aMonitor, null);
- } catch (Exception e) {
- Logger.getLogger().logError(e);
- }
-
- if (!clientProjectName.equals(projectName)) {
- IDataModel dataModel = DataModelFactory.createDataModel(new JARDependencyDataModelProvider());
- dataModel.setProperty(JARDependencyDataModelProperties.PROJECT_NAME, projectName);
- dataModel.setProperty(JARDependencyDataModelProperties.REFERENCED_PROJECT_NAME, clientProjectName);
- dataModel.setIntProperty(JARDependencyDataModelProperties.JAR_MANIPULATION_TYPE, JARDependencyDataModelProperties.JAR_MANIPULATION_ADD);
- try {
- dataModel.getDefaultOperation().execute(aMonitor, null);
- } catch (Exception e) {
- Logger.getLogger().logError(e);
- }
- }
- }
-
-
- private void updateEJBDD(IProgressMonitor monitor) {
-
- String projectName = model.getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME);
- IProject ejbProj = ProjectUtilities.getProject(projectName);
-
- IDataModel ejbClientComponentDataModel = (IDataModel) model.getProperty(IEjbComponentCreationDataModelProperties.NESTED_MODEL_EJB_CLIENT_CREATION);
- String clientProjectName = ejbClientComponentDataModel.getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME);
-
- IVirtualComponent c = ComponentCore.createComponent(ejbProj);
- Properties props = c.getMetaProperties();
-
- String clienturi = props.getProperty(CreationConstants.CLIENT_JAR_URI);
-
- EJBArtifactEdit ejbEdit = null;
- try {
- ejbEdit = EJBArtifactEdit.getEJBArtifactEditForWrite(ejbProj);
- if (ejbEdit != null) {
- EJBJarImpl ejbres = (EJBJarImpl) ejbEdit.getDeploymentDescriptorRoot();
- if( clienturi != null && !clienturi.equals("")){
- ejbres.setEjbClientJar(clienturi);//$NON-NLS-1$
- }else
- ejbres.setEjbClientJar(clientProjectName + ".jar");//$NON-NLS-1$
- ejbres.setEjbClientJar(clienturi);//$NON-NLS-1$
- ejbEdit.saveIfNecessary(monitor);
- }
- } catch (Exception e) {
- Logger.getLogger().logError(e);
- } finally {
- if (ejbEdit != null)
- ejbEdit.dispose();
- }
- }
-}
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 077bd80..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EjbFacetInstallDataModelProvider.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.project.operations;
-
-import java.util.Set;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.CreationConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.J2EEModuleFacetInstallDataModelProvider;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-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;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-public class EjbFacetInstallDataModelProvider
- extends J2EEModuleFacetInstallDataModelProvider
- implements IEjbFacetInstallDataModelProperties{
-
- public static final IProjectFacetVersion EJB_11 = ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_EJB_MODULE).getVersion("1.1"); //$NON-NLS-1$
- public static final IProjectFacetVersion EJB_20 = ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_EJB_MODULE).getVersion("2.0"); //$NON-NLS-1$
- public static final IProjectFacetVersion EJB_21 = ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_EJB_MODULE).getVersion("2.1"); //$NON-NLS-1$
-
- 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 J2EEProjectUtilities.EJB;
- }else if (propertyName.equals(CREATE_CLIENT)) {
- return Boolean.TRUE;
- } else if (propertyName.equals(CLIENT_SOURCE_FOLDER)) {
- return CreationConstants.DEFAULT_EJB_SOURCE_FOLDER;
- }else if (propertyName.equals(CONFIG_FOLDER)){
- return CreationConstants.DEFAULT_EJB_SOURCE_FOLDER;
- }else if (propertyName.equals(CLIENT_NAME)){
- String projectName = model.getStringProperty(FACET_PROJECT_NAME);
- return projectName + "Client"; //$NON-NLS-1$
- }else if (propertyName.equals(CLIENT_URI)){
- String projectName = model.getStringProperty(FACET_PROJECT_NAME);
- return projectName + "Client.jar"; //$NON-NLS-1$
- }
- return super.getDefaultProperty(propertyName);
- }
-
-
- protected int convertFacetVersionToJ2EEVersion(IProjectFacetVersion version) {
- if (EJB_11.equals(version)) {
- return J2EEVersionConstants.J2EE_1_2_ID;
- } else if (EJB_20.equals(version)) {
- return J2EEVersionConstants.J2EE_1_3_ID;
- }
- return J2EEVersionConstants.J2EE_1_4_ID;
- }
-
- public boolean isPropertyEnabled(String propertyName) {
- if ( CLIENT_NAME.equals(propertyName )) {
- return getBooleanProperty(CREATE_CLIENT);
- }else if( CLIENT_URI.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);
- }else if (propertyName.equals(FACET_PROJECT_NAME)){
- model.setStringProperty(CLIENT_NAME, (String)propertyValue + "Client");
- model.setStringProperty(CLIENT_URI, (String)propertyValue + "Client.jar");
- }
- return status;
- }
-
- public IStatus validate(String propertyName) {
- if (propertyName.equals(CLIENT_NAME)) {
- String projectName = model.getStringProperty( CLIENT_NAME );
- IStatus status = ProjectCreationDataModelProviderNew.validateName( projectName );
- if (!status.isOK())
- return status;
- }else if( propertyName.equals(CLIENT_URI)){
- String clientURI = model.getStringProperty( CLIENT_URI );
- IStatus status = ProjectCreationDataModelProviderNew.validateName( clientURI );
- if (!status.isOK())
- return status;
-
- }
- return OK_STATUS;
- }
-
-}
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 38a9879..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EjbFacetProjectCreationDataModelProvider.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.project.operations;
-
-import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties;
-import org.eclipse.jst.common.project.facet.JavaFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.FacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class EjbFacetProjectCreationDataModelProvider extends
- FacetProjectCreationDataModelProvider {
-
- public EjbFacetProjectCreationDataModelProvider() {
- super();
- }
-
- public void init() {
- super.init();
- FacetDataModelMap map = (FacetDataModelMap) getProperty(FACET_DM_MAP);
- IDataModel javaFacet = DataModelFactory.createDataModel(new JavaFacetInstallDataModelProvider());
- map.add(javaFacet);
- IDataModel ejbFacet = DataModelFactory.createDataModel(new EjbFacetInstallDataModelProvider());
- map.add(ejbFacet);
- javaFacet.setProperty(IJavaFacetInstallDataModelProperties.SOURCE_FOLDER_NAME,ejbFacet.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER));
- }
-
-}
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 418c30f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/IEjbFacetInstallDataModelProperties.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.project.operations;
-
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-
-public interface IEjbFacetInstallDataModelProperties
- extends IJ2EEModuleFacetInstallDataModelProperties {
-
- 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/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 aa3c942..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/refactor/UpdateEJBClientRefOp.java
+++ /dev/null
@@ -1,140 +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.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();
- EJBArtifactEdit 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());
- 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 648bbbe..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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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("ETypeClassifier_UI_"), //$NON-NLS-1$ = "ETypeClassifier"
- EJBProviderLibrariesResourceHandler.getString("The_eTypeClassifier_proper_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());
- }
-
- 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 20a013b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/EJBJarItemProvider.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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;
- 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); //$NON-NLS-1$
- }
-
- 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 955f475..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbedit/org/eclipse/jst/j2ee/internal/ejb/provider/MethodElementItemProvider.java
+++ /dev/null
@@ -1,353 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.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 73cce45..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbvalidator/org/eclipse/jst/j2ee/internal/ejb/workbench/validation/EJBHelper.java
+++ /dev/null
@@ -1,786 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.Archive;
-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.impl.EJBJarFileImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-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.componentcore.util.EJBArtifactEdit;
-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.internal.validation.DependencyUtil;
-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;
-
- 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;
- }
-
- /**
- * 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());
- ArtifactEdit edit = ComponentUtilities.getArtifactEditForRead(comp);
-
- try {
- return ((EJBArtifactEdit) edit).asArchive(false);
- } catch (OpenFailureException e1) {
- Logger.getLogger().log(e1);
- }finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- return null;
- }
-
- /**
- * Load the EJB MOF model.
- */
- public EObject loadEjbModel() {
- IVirtualComponent comp = ComponentCore.createComponent(getProject());
- ArtifactEdit edit = ComponentUtilities.getArtifactEditForRead(comp);
-
- try {
- Archive archive = ((EJBArtifactEdit) edit).asArchive(false);
- return ((EJBJarFileImpl)archive).getDeploymentDescriptor();
- } catch (OpenFailureException e1) {
- Logger.getLogger().log(e1);
- }finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- return null;
- }
-
- /**
- * 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/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 41559f9..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbvalidator/org/eclipse/jst/j2ee/internal/ejb/workbench/validation/UIEjbValidator.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.IProject;
-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.ArtifactEdit;
-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;
-
-
-
-public class UIEjbValidator extends EJBValidator {
-
- /**
- * UIEjbValidator constructor comment.
- */
- public UIEjbValidator() {
- super();
- }
-
- public void validate(IValidationContext inHelper, IReporter inReporter) throws org.eclipse.wst.validation.internal.core.ValidationException {
-
- IProject proj = ((IWorkbenchContext) inHelper).getProject();
- IVirtualComponent wbModule = ComponentCore.createComponent(proj);
- if(J2EEProjectUtilities.isEJBProject(proj)) {
-
-
- IVirtualFile ejbDD = wbModule.getRootFolder().getFile(J2EEConstants.EJBJAR_DD_URI);
- if( ejbDD.exists()){
- ArtifactEdit edit = null;
- try {
- edit = ArtifactEdit.getArtifactEditForRead(wbModule);
- super.validate(inHelper, inReporter);
- } finally {
- if (edit != null)
- edit.dispose();
- }
- }
- }
- }
-
-}
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 0f88002..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/plugin.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-#
-# 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
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 e9bfe22..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/plugin.xml
+++ /dev/null
@@ -1,212 +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>
- <projectNature
- id="org.eclipse.wst.common.modulecore.ModuleCoreNature">
- </projectNature>
- <filter
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="ejb-jar.xml">
- </filter>
- <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.ui.ide.resourceFilters">
- <filter
- pattern=".JETEmitters"
- selected="true">
- </filter>
- <filter
- pattern="gen"
- selected="true">
- </filter>
- </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>
-
-
- <!-- Project Facets -->
- <extension point="org.eclipse.wst.common.project.facet.core.facets">
-
- <project-facet id="jst.ejb">
- <label>EJB Module</label>
- <description>Enables the project to be deployed as an EJB module.</description>
- <icon>icons/EJBJar.gif</icon>
- </project-facet>
-
- <project-facet-version facet="jst.ejb" version="1.1">
- <action type="install">
- <delegate class="org.eclipse.jst.j2ee.ejb.project.facet.EjbFacetInstallDelegate"/>
- <config-factory class="org.eclipse.jst.j2ee.internal.ejb.project.operations.EjbFacetInstallDataModelProvider"/>
- </action>
- <action type="runtime-changed">
- <delegate class="org.eclipse.jst.j2ee.project.facet.J2EEFacetRuntimeChangedDelegate"/>
- </action>
- <constraint>
- <and>
- <requires facet="jst.java" version=">=1.3"/>
- <conflicts group="modules"/>
- </and>
- </constraint>
- <group-member id="modules"/>
- </project-facet-version>
-
- <project-facet-version facet="jst.ejb" version="2.0">
- <action type="install">
- <delegate class="org.eclipse.jst.j2ee.ejb.project.facet.EjbFacetInstallDelegate"/>
- <config-factory class="org.eclipse.jst.j2ee.internal.ejb.project.operations.EjbFacetInstallDataModelProvider"/>
- </action>
- <action type="runtime-changed">
- <delegate class="org.eclipse.jst.j2ee.project.facet.J2EEFacetRuntimeChangedDelegate"/>
- </action>
- <constraint>
- <and>
- <requires facet="jst.java" version=">=1.3"/>
- <conflicts group="modules"/>
- </and>
- </constraint>
- <group-member id="modules"/>
- </project-facet-version>
-
- <project-facet-version facet="jst.ejb" version="2.1">
- <action type="install">
- <delegate class="org.eclipse.jst.j2ee.ejb.project.facet.EjbFacetInstallDelegate"/>
- <config-factory class="org.eclipse.jst.j2ee.internal.ejb.project.operations.EjbFacetInstallDataModelProvider"/>
- </action>
- <action type="runtime-changed">
- <delegate class="org.eclipse.jst.j2ee.project.facet.J2EEFacetRuntimeChangedDelegate"/>
- </action>
- <constraint>
- <and>
- <requires facet="jst.java" version=">=1.3"/>
- <conflicts group="modules"/>
- </and>
- </constraint>
- <group-member id="modules"/>
- </project-facet-version>
-
- <template id="template.jst.ejb">
- <label>EJB Project</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>
-</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 d4a3b76..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/property_files/ejbcreation.properties
+++ /dev/null
@@ -1,126 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-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.
-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 atleast 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=
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 ce6bcde..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/property_files/ejbvalidator.properties
+++ /dev/null
@@ -1,1528 +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
-###############################################################################
-#
-# *************************************************************************
-# * 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. 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.
-
-###########################################################################
-#
-# 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/BackendMigration.exsd b/plugins/org.eclipse.jst.j2ee.ejb/schema/BackendMigration.exsd
deleted file mode 100644
index 7da697f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/schema/BackendMigration.exsd
+++ /dev/null
@@ -1,119 +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="BackendMigration" name="BackendMigration"/>
- </appInfo>
- <documentation>
- This extension point gives the ability to do the backend migration of the CMP's.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="backendMigrationExt"/>
- </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="backendMigrationExt">
- <annotation>
- <documentation>
- This extension point give the ability to do the backend migration of the CMP's.
- </documentation>
- </annotation>
- <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/schema/Delete11Relationships.exsd b/plugins/org.eclipse.jst.j2ee.ejb/schema/Delete11Relationships.exsd
deleted file mode 100644
index 0f5002f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/schema/Delete11Relationships.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="Delete11Relationships" name="Delete11Relationships"/>
- </appInfo>
- <documentation>
- This extension point gives the ability to delete CMP11 relationships.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="delete11RelationshipsExHandler"/>
- </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="delete11RelationshipsExHandler">
- <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/schema/DeleteDeployCode.exsd b/plugins/org.eclipse.jst.j2ee.ejb/schema/DeleteDeployCode.exsd
deleted file mode 100644
index 8c5833c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/schema/DeleteDeployCode.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="DeleteDeployCode" name="DeleteDeployCode"/>
- </appInfo>
- <documentation>
- This extension point gives the ability to delete the deploy code of an ejb.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="deleteDeployCodeExt"/>
- </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="deleteDeployCodeExt">
- <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/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/basicEntityMembers.template b/plugins/org.eclipse.jst.j2ee.ejb/templates/basicEntityMembers.template
deleted file mode 100644
index 7f41754..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/templates/basicEntityMembers.template
+++ /dev/null
@@ -1,45 +0,0 @@
-
- private EntityContext myEntityCtx;
- /**
- * ejbActivate
- */
- public void ejbActivate() {
- }
- /**
- * ejbLoad
- */
- public void ejbLoad() {
- }
- /**
- * ejbPassivate
- */
- public void ejbPassivate() {
- }
- /**
- * ejbRemove
- */
- public void ejbRemove() throws RemoveException {
- }
- /**
- * ejbStore
- */
- public void ejbStore() {
- }
- /**
- * getEntityContext
- */
- public EntityContext getEntityContext() {
- return myEntityCtx;
- }
- /**
- * setEntityContext
- */
- public void setEntityContext(EntityContext ctx) {
- myEntityCtx = ctx;
- }
- /**
- * unsetEntityContext
- */
- public void unsetEntityContext() {
- myEntityCtx = null;
- }
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/templates/cmp1xEntityXDoclet.javajet b/plugins/org.eclipse.jst.j2ee.ejb/templates/cmp1xEntityXDoclet.javajet
deleted file mode 100644
index b4bad0f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/templates/cmp1xEntityXDoclet.javajet
+++ /dev/null
@@ -1,42 +0,0 @@
-<%@ jet package="com.ibm.wtp.ejb"
- imports="com.ibm.etools.j2ee.ejb.creation.operations.* java.util.* com.ibm.etools.ejb.creation.*"
- class="CMP1xEntityBeanTemplate" %>
-
-<%@ include file="cmpHeader.template" %>
-public class <%=model.getSimpleBeanClassName()%> <% if (model.getQualifiedSuperBeanClassName() != "") { %>extends <%=model.getQualifiedSuperBeanClassName()%> <% } %>implements EntityBean {
-<%@ include file="basicEntityMembers.template" %>
-
- /**
- * ejbCreate
- */
- public <%=model.getKeyClassName()%> ejbCreate() throws CreateException {
- return null;
- }
- /**
- * ejbPostCreate
- */
- public void ejbPostCreate() throws CreateException {
- }
-
-<%
- Iterator fields = model.getCMPFields().iterator();
- CMPField field = null;
- while (fields.hasNext()) {
- field = (CMPField)fields.next();
- String sfx = field.methodSuffix();
-%>
- /**
- * Get accessor for persistent attribute: <%= field.getName() %>
- */
- public abstract <%= field.getTypeSignature() %> get<%=sfx%>();
-
- /**
- * Set accessor for persistent attribute: <%= field.getName() %>
- */
- public abstract void set<%=sfx%>(<%=field.getTypeSignature()%> new<%=sfx%>);
-
-<% } %>
-
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/templates/cmp2xEntityXDoclet.javajet b/plugins/org.eclipse.jst.j2ee.ejb/templates/cmp2xEntityXDoclet.javajet
deleted file mode 100644
index cb0cc47..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/templates/cmp2xEntityXDoclet.javajet
+++ /dev/null
@@ -1,57 +0,0 @@
-<%@ jet package="com.ibm.wtp.ejb"
- imports="com.ibm.etools.j2ee.ejb.creation.operations.* java.util.* com.ibm.etools.ejb.creation.*"
- class="CMP2xEntityBeanTemplate"
-%><%@ include file="cmpHeader.template" %>
-
-public abstract class <%=model.getSimpleBeanClassName()%> <% if (model.getQualifiedSuperBeanClassName() != "") { %>extends <%=model.getQualifiedSuperBeanClassName()%> <% } %>implements EntityBean {
-<%@ include file="basicEntityMembers.template"
-%><%
- /* Used in multiple locations for iterating fields */
- Iterator fields = null;
- CMPField field = null;
- boolean isFirst;
-%>
- /**
- * ejbCreate
- * @ejb.create-method
- * view-type="<%= model.getRemoteHome() == null ? "remote" : "local" %>"
- */
- public <%=model.getKeyClassName()%> ejbCreate(<%@ include file="keyFieldList.template" %>) throws CreateException {
-<% fields = model.getCMPFields().iterator();
- while (fields.hasNext()) {
- field = (CMPField)fields.next();
- if (field.isIsKey()) {
- String sfx = field.methodSuffix();%>
- set<%=sfx%>(<%=field.getName()%>);
-<% }
-}%>
- return null;
- }
- /**
- * ejbPostCreate
- */
- public void ejbPostCreate(<%@ include file="keyFieldList.template" %>) throws CreateException {
- }
-
-<% fields = model.getCMPFields().iterator();
- while (fields.hasNext()) {
- field = (CMPField)fields.next();
- String sfx = field.methodSuffix();
-%>
- /**
- * Get accessor for persistent attribute: <%= field.getName() %>
- * @ejb.persistence
- * read-only="<%=field.isGetterRO()%>"<%@ include file="interfaceMethod.template" %><%
- if (!model.usesPrimitiveKey() && field.isIsKey()) {%>
- * @ejb.pk-field<%}%>
- */
- public abstract <%= field.getTypeSignature() %> get<%=sfx%>();
-
- /**
- * Set accessor for persistent attribute: <%= field.getName() %>
- * @ejb.persistence <%@ include file="interfaceMethod.template" %>
- */
- public abstract void set<%=sfx%>(<%=field.getTypeSignature()%> new<%=sfx%>);
-
-<% } %>
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/templates/cmpHeader.template b/plugins/org.eclipse.jst.j2ee.ejb/templates/cmpHeader.template
deleted file mode 100644
index c6bfc4c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/templates/cmpHeader.template
+++ /dev/null
@@ -1,37 +0,0 @@
-<% CreateCMPEntityBeanTemplateModel model = (CreateCMPEntityBeanTemplateModel) argument;
-%>package <%=model.getBeanClassPackageName()%>;
-import javax.ejb.EntityBean;
-import javax.ejb.EntityContext;
-import javax.ejb.CreateException;
-import javax.ejb.RemoveException;
-
-/**
- * Bean implementation class for Entity Bean: <%=model.getBeanName()%>
- *
- * @ejb.bean
- * name="<%=model.getBeanName()%>"
- * type="CMP"
- * cmp-version=<%=(model.isCMP2x()) ? "\"2.x\"" : "\"1.x\""%>
-<% if (model.isCMP2x()) { %>
- * schema="<%=model.getBeanName()%>"
-<% }
- if (model.hasRemoteClient()) {%>
- * jndi-name="<%=model.getJndiName()%>"
-<% }
- if (model.hasLocalClient()) {%>
- * local-jndi-name="<%=model.getJndiName()%>"
- <% }
- if (model.is2x()) { %>
- * view-type="<%=model.getViewType()%>"
- <% } %>
- * reentrant="true"
- <% if (model.usesPrimitiveKey()) { %>
- * primkey-field="<%=model.getPrimkeyFieldName()%>"
- <% } %>
- *
-<%@ include file="interfaces.template" %>
- *
- * @ejb.pk
- * class="<%=model.getKeyClassName()%>"
- *
- */
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/templates/entityXDoclet.javajet b/plugins/org.eclipse.jst.j2ee.ejb/templates/entityXDoclet.javajet
deleted file mode 100644
index e250ddf..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/templates/entityXDoclet.javajet
+++ /dev/null
@@ -1,54 +0,0 @@
-<%@ jet package="com.ibm.wtp.ejb" imports="com.ibm.etools.j2ee.ejb.creation.operations.*" class="EntityBeanTemplate" %>
-<% CreateEntityBeanTemplateModel model = (CreateEntityBeanTemplateModel) argument; %>
-package <%=model.getBeanClassPackageName()%>;
-import javax.ejb.EntityBean;
-import javax.ejb.EntityContext;
-import javax.ejb.CreateException;
-import javax.ejb.RemoveException;
-import javax.ejb.FinderException;
-
-/**
- * Bean implementation class for Entity Bean: <%=model.getBeanName()%>
- *
- * @ejb.bean
- * name="<%=model.getBeanName()%>"
- * type="BMP"
-<% if (model.hasRemoteClient()) {%>
- * jndi-name="<%=model.getJndiName()%>"
-<% }
- if (model.hasLocalClient()) {%>
- * local-jndi-name="<%=model.getJndiName()%>"
- <% }
- if (model.is2x()) { %>
- * view-type="<%=model.getViewType()%>"
- <% } %>
- * reentrant="true"
- *
-<%@ include file="interfaces.template" %>
- *
- * @ejb.pk
- * class="<%=model.getKeyClassName()%>"
- *
- */
-public class <%=model.getSimpleBeanClassName()%> <% if (model.getQualifiedSuperBeanClassName() != "") { %>extends <%=model.getQualifiedSuperBeanClassName()%> <% } %>implements EntityBean {
-<%@ include file="basicEntityMembers.template" %>
-
- /**
- * ejbCreate
- */
- public <%=model.getKeyClassName()%> ejbCreate() throws CreateException {
- return null;
- }
- /**
- * ejbPostCreate
- */
- public void ejbPostCreate() throws CreateException {
- }
- /**
- * ejbFindByPrimaryKey
- */
- public <%=model.getKeyClassName()%> ejbFindByPrimaryKey(<%=model.getKeyClassName()%> primaryKey)
- throws FinderException {
- return null;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/templates/interfaceMethod.template b/plugins/org.eclipse.jst.j2ee.ejb/templates/interfaceMethod.template
deleted file mode 100644
index fe70376..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/templates/interfaceMethod.template
+++ /dev/null
@@ -1,11 +0,0 @@
-<% if (field.isPromoteLocalGS() || field.isPromoteGS()) {
- String value = null;
- if (field.isPromoteLocalGS() && field.isPromoteGS())
- value = "both";
- else if (field.isPromoteLocalGS())
- value = "local";
- else
- value = "remote";%>
- * @ejb.interface-method
- * view-type="<%=value%>"
-<% } %>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/templates/interfaces.template b/plugins/org.eclipse.jst.j2ee.ejb/templates/interfaces.template
deleted file mode 100644
index 568b4ae..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/templates/interfaces.template
+++ /dev/null
@@ -1,22 +0,0 @@
- * @ejb.home
- <% if (model.hasRemoteClient()) { %>
- * remote-class="<%=model.getRemoteHome()%>"
- <% } %>
- <% if (model.hasLocalClient()) { %>
- * local-class="<%=model.getLocalHome()%>"
- <% } %>
- *
- * @ejb.interface
- <% if (model.hasRemoteClient()) { %>
- * remote-class="<%=model.getRemote()%>"
- <% String extensions = model.getRemoteExtends();
- if (extensions != null && extensions.length() > 0) { %>
- * extends="<%=extensions%>"<%
- }
- } if (model.hasLocalClient()) { %>
- * local-class="<%=model.getLocal()%>"
- <% String extensions = model.getLocalExtends();
- if (extensions != null && extensions.length() > 0) { %>
- * local-extends="<%=extensions%>"
-<% }
- } %>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/templates/keyFieldList.template b/plugins/org.eclipse.jst.j2ee.ejb/templates/keyFieldList.template
deleted file mode 100644
index 4aa79f9..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/templates/keyFieldList.template
+++ /dev/null
@@ -1,11 +0,0 @@
-<% fields = model.getCMPFields().iterator();
- isFirst = true;
- while (fields.hasNext()) {
- field = (CMPField)fields.next();
- if (field.isIsKey()) {
- if (isFirst)
- isFirst = false;
- else {
- %>, <% } %><%=field.getTypeSignature()%> <%=field.getName()%><%
- }
- }%>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/templates/mdbXDoclet.javajet b/plugins/org.eclipse.jst.j2ee.ejb/templates/mdbXDoclet.javajet
deleted file mode 100644
index 51d8e95..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/templates/mdbXDoclet.javajet
+++ /dev/null
@@ -1,53 +0,0 @@
-<%@ jet package="com.ibm.wtp.ejb" imports="com.ibm.etools.j2ee.ejb.creation.operations.*" class="MessageDrivenBeanTemplate" %>
-<% CreateMessageDrivenBeanTemplateModel model = (CreateMessageDrivenBeanTemplateModel) argument; %>
-package <%=model.getBeanClassPackageName()%>;
-import javax.ejb.MessageDrivenBean;
-import javax.ejb.MessageDrivenContext;
-import javax.ejb.CreateException;
-
-/**
- * Bean implementation class for Message-Driven Bean: <%=model.getBeanName()%>
- *
- * @ejb.bean
- * name="<%=model.getBeanName()%>"
- * transaction-type="<%=model.getTransactionType()%>"
- <% if (model.hasAcknowledgeMode()) { %>
- * acknowledge-mode="<%=model.getAcknowledgeMode()%>"
- <% } %>
- * destination-type="<%=model.getDestinationType()%>"
- <% if (model.hasSubscriptionDurability()) { %>
- * subscription-durability="<%=model.getSubscriptionDurability()%>"
- <% } %>
- * message-selector="<%=model.getMessageSelector()%>"
- *
- */
-public class <%=model.getSimpleBeanClassName()%> <% if (model.getQualifiedSuperBeanClassName() != "") { %>extends <%=model.getQualifiedSuperBeanClassName()%> <% } %>implements MessageDrivenBean {
- private MessageDrivenContext myMessageDrivenCtx;
- /**
- * getMessageDrivenContext
- */
- public MessageDrivenContext getMessageDrivenContext() {
- return myMessageDrivenCtx;
- }
- /**
- * setMessageDrivenContext
- */
- public void setMessageDrivenContext(MessageDrivenContext ctx) {
- myMessageDrivenCtx = ctx;
- }
- /**
- * ejbCreate
- */
- public void ejbCreate() throws CreateException {
- }
- /**
- * ejbRemove
- */
- public void ejbRemove() {
- }
- /**
- * onMessage
- */
- public void onMessage(javax.jms.Message msg) {
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/templates/sessionXDoclet.javajet b/plugins/org.eclipse.jst.j2ee.ejb/templates/sessionXDoclet.javajet
deleted file mode 100644
index ead574b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb/templates/sessionXDoclet.javajet
+++ /dev/null
@@ -1,62 +0,0 @@
-<%@ jet package="com.ibm.wtp.ejb" imports="com.ibm.etools.j2ee.ejb.creation.operations.*" class="SessionBeanTemplate" %>
-<% CreateSessionBeanTemplateModel model = (CreateSessionBeanTemplateModel) argument; %>
-package <%=model.getBeanClassPackageName()%>;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.CreateException;
-
-/**
- * Bean implementation class for Session Bean: <%=model.getBeanName()%>
- *
- * @ejb.bean
- * name="<%=model.getBeanName()%>"
- * type="<%=model.getSessionType()%>"
-<% if (model.hasRemoteClient()) {%>
- * jndi-name="<%=model.getJndiName()%>"
-<% }
- if (model.hasLocalClient()) {%>
- * local-jndi-name="<%=model.getJndiName()%>"
- <% }
- if (model.is2x()) { %>
- * view-type="<%=model.getViewType()%>"
- <% } %>
- * transaction-type="<%=model.getTransactionType()%>"
- *
-<%@ include file="interfaces.template" %>
- *
- */
-public class <%=model.getSimpleBeanClassName()%> <% if (model.getQualifiedSuperBeanClassName() != "") { %>extends <%=model.getQualifiedSuperBeanClassName()%> <% } %>implements SessionBean {
- private SessionContext mySessionCtx;
- /**
- * getSessionContext
- */
- public SessionContext getSessionContext() {
- return mySessionCtx;
- }
- /**
- * setSessionContext
- */
- public void setSessionContext(SessionContext ctx) {
- mySessionCtx = ctx;
- }
- /**
- * ejbCreate
- */
- public void ejbCreate() throws CreateException {
- }
- /**
- * ejbActivate
- */
- public void ejbActivate() {
- }
- /**
- * ejbPassivate
- */
- public void ejbPassivate() {
- }
- /**
- * ejbRemove
- */
- public void ejbRemove() {
- }
-}
\ 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 751c8f2..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"/>
- <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 47e3103..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-@dot
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 d4f2833..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: XDocletRuntime Plug-in
-Bundle-SymbolicName: org.eclipse.jst.j2ee.xdoclet.runtime; singleton:=true
-Bundle-Version: 1.0.0
-Bundle-Activator: org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletRuntimePlugin
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.jst.j2ee.ejb.annotations.xdoclet,
- org.eclipse.core.resources
-Eclipse-AutoStart: true
-Export-Package: org.eclipse.jst.j2ee.xdoclet.runtime.internal.server,
- org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks
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 0eec705..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- plugin.properties
-
\ 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 6968ef8..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/plugin.properties
+++ /dev/null
@@ -1,67 +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
-
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 da1a369..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/plugin.xml
+++ /dev/null
@@ -1,805 +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.project.dir}/${web.module.webinf}"
- id="webdoclet.deploymentdescriptor.mergedir"
- include="true"
- label="mergedir"
- type="string"
- description="%webdoclet.deploymentdesc.mergedir"/>
- <TaskProperty
- default="${web.project.dir}/${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"/>
- </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"/>
- </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"/>
- <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="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="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="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="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"/>
- <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."/>
-
- </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"/>
- <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."/>
- </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"/>
- <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"/>
-
- <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."/>
-
- </extension>
-
-</plugin>
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/server/JBossEjbdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/JBossEjbdocletTaskProvider.java
deleted file mode 100644
index 12c295b..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/JBossEjbdocletTaskProvider.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.server;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class JBossEjbdocletTaskProvider extends XDocletTaskProviderImpl {
-
- public static String NAMESPACE = "ejbdoclet.jboss.";
-
- public String getTask() {
- StringBuffer buffer = new StringBuffer(256);
- buffer.append("<jboss ");
- buildAttributes(buffer);
- buffer.append(" />");
- return buffer.toString();
- }
-
- public String getNamespace() {
- return NAMESPACE;
- }
-
- public IStatus validate() {
- return Status.OK_STATUS;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/JBossWebdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/JBossWebdocletTaskProvider.java
deleted file mode 100644
index 986f6dc..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/JBossWebdocletTaskProvider.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.server;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class JBossWebdocletTaskProvider extends XDocletTaskProviderImpl {
-
- public static String NAMESPACE = "webdoclet.jboss.";
-
- public String getTask() {
-
- StringBuffer buffer = new StringBuffer(256);
- buffer.append("<jbosswebxml ");
- buildAttributes(buffer);
- buffer.append(" />");
- return buffer.toString();
- }
-
- public String getNamespace() {
- return NAMESPACE;
- }
-
- public IStatus validate() {
- return Status.OK_STATUS;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/JonasEjbdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/JonasEjbdocletTaskProvider.java
deleted file mode 100644
index fda961f..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/JonasEjbdocletTaskProvider.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.server;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class JonasEjbdocletTaskProvider extends XDocletTaskProviderImpl {
-
- public static String NAMESPACE = "ejbdoclet.jonas.";
-
- public String getTask() {
- StringBuffer buffer = new StringBuffer(256);
- buffer.append("<jonas ");
- buildAttributes(buffer);
- buffer.append(" />");
- return buffer.toString();
- }
-
- public String getNamespace() {
- return NAMESPACE;
- }
-
- public IStatus validate() {
- return Status.OK_STATUS;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/JonasWebdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/JonasWebdocletTaskProvider.java
deleted file mode 100644
index d04e732..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/JonasWebdocletTaskProvider.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.server;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class JonasWebdocletTaskProvider extends XDocletTaskProviderImpl {
-
- public static String NAMESPACE = "webdoclet.jonas.";
-
- public String getTask() {
- StringBuffer buffer = new StringBuffer(256);
- buffer.append("<jonaswebxml ");
- buildAttributes(buffer);
- buffer.append(" />");
- return buffer.toString();
- }
-
- public String getNamespace() {
- return NAMESPACE;
- }
-
- public IStatus validate() {
- return Status.OK_STATUS;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/WeblogicEjbdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/WeblogicEjbdocletTaskProvider.java
deleted file mode 100644
index 7b59917..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/WeblogicEjbdocletTaskProvider.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.server;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class WeblogicEjbdocletTaskProvider extends XDocletTaskProviderImpl {
-
- public static String NAMESPACE = "ejbdoclet.weblogic.";
-
- public String getTask() {
- StringBuffer buffer = new StringBuffer(256);
- buffer.append("<weblogic ");
- buildAttributes(buffer);
- buffer.append(" />");
- return buffer.toString();
- }
-
- public String getNamespace() {
- return NAMESPACE;
- }
-
- public IStatus validate() {
- return Status.OK_STATUS;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/WeblogicWebdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/WeblogicWebdocletTaskProvider.java
deleted file mode 100644
index 80a04f0..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/WeblogicWebdocletTaskProvider.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.server;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class WeblogicWebdocletTaskProvider extends XDocletTaskProviderImpl {
-
- public static String NAMESPACE = "webdoclet.weblogic.";
-
- public String getTask() {
- StringBuffer buffer = new StringBuffer(256);
- buffer.append("<weblogicwebxml ");
- buildAttributes(buffer);
- buffer.append(" />");
- return buffer.toString();
- }
-
- public String getNamespace() {
- return NAMESPACE;
- }
-
- public IStatus validate() {
- return Status.OK_STATUS;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/WebsphereEjbdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/WebsphereEjbdocletTaskProvider.java
deleted file mode 100644
index ead9643..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/WebsphereEjbdocletTaskProvider.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.server;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class WebsphereEjbdocletTaskProvider extends XDocletTaskProviderImpl {
-
- public static String NAMESPACE = "ejbdoclet.websphere.";
-
- public String getTask() {
- StringBuffer buffer = new StringBuffer(256);
- buffer.append("<webSphere ");
- buildAttributes(buffer);
- buffer.append(" />");
- return buffer.toString();
- }
-
- public String getNamespace() {
- return NAMESPACE;
- }
-
- public IStatus validate() {
- return Status.OK_STATUS;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/WebsphereWebdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/WebsphereWebdocletTaskProvider.java
deleted file mode 100644
index c931815..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/server/WebsphereWebdocletTaskProvider.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.server;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class WebsphereWebdocletTaskProvider extends XDocletTaskProviderImpl {
-
- public static String NAMESPACE = "webdoclet.websphere.";
-
- public String getTask() {
- StringBuffer buffer = new StringBuffer(256);
- buffer.append("<webspherewebxml ");
- buildAttributes(buffer);
- buffer.append(" />");
- return buffer.toString();
- }
-
- public String getNamespace() {
- return NAMESPACE;
- }
-
- public IStatus validate() {
- return Status.OK_STATUS;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/DaoEjbdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/DaoEjbdocletTaskProvider.java
deleted file mode 100644
index b320cc2..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/DaoEjbdocletTaskProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks;
-
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class DaoEjbdocletTaskProvider extends XDocletTaskProviderImpl {
-
- public static String NAMESPACE = "ejbdoclet.dao.";
-
- public String getTask() {
- StringBuffer buffer = new StringBuffer(256);
- buffer.append("<dao ");
- buildAttributes(buffer);
- buffer.append(" />");
- return buffer.toString();
- }
-
- public String getNamespace() {
- return NAMESPACE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/DataObjectEjbdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/DataObjectEjbdocletTaskProvider.java
deleted file mode 100644
index 4902a0d..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/DataObjectEjbdocletTaskProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks;
-
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class DataObjectEjbdocletTaskProvider extends XDocletTaskProviderImpl {
-
- public static String NAMESPACE = "ejbdoclet.dataobject.";
-
- public String getTask() {
- StringBuffer buffer = new StringBuffer(256);
- buffer.append("<dataobject ");
- buildAttributes(buffer);
- buffer.append(" />");
- return buffer.toString();
- }
-
- public String getNamespace() {
- return NAMESPACE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/DeploymentDescriptorEjbdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/DeploymentDescriptorEjbdocletTaskProvider.java
deleted file mode 100644
index d935596..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/DeploymentDescriptorEjbdocletTaskProvider.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks;
-
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class DeploymentDescriptorEjbdocletTaskProvider extends XDocletTaskProviderImpl {
-
- public static String NAMESPACE = "ejbdoclet.deploymentdescriptor.";
-
- public String getTask() {
- StringBuffer buffer = new StringBuffer(256);
- buffer.append("<deploymentdescriptor ");
- buildAttributes(buffer);
- buffer.append(" />");
- return buffer.toString();
- }
-
- public String getNamespace() {
- return NAMESPACE;
- }
-
- protected void addAttribute(String attribute, StringBuffer stringBuffer) {
- if ("clientjar".equals(attribute)) {
- if (getClientProject() != null) {
- super.addAttribute(attribute, stringBuffer);
- }
- } else {
- super.addAttribute(attribute, stringBuffer);
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/DeploymentDescriptorWebdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/DeploymentDescriptorWebdocletTaskProvider.java
deleted file mode 100644
index a1c3522..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/DeploymentDescriptorWebdocletTaskProvider.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks;
-
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class DeploymentDescriptorWebdocletTaskProvider extends XDocletTaskProviderImpl {
-
- public static String NAMESPACE = "webdoclet.deploymentdescriptor.";
-
- public String getTask() {
- StringBuffer buffer = new StringBuffer(256);
- buffer.append("<deploymentdescriptor ");
- buildAttributes(buffer);
- buffer.append(" />");
- return buffer.toString();
- }
-
- public String getNamespace() {
- return NAMESPACE;
- }
-
- protected void addAttribute(String attribute, StringBuffer stringBuffer) {
- if ("clientjar".equals(attribute)) {
- if (getClientProject() != null) {
- super.addAttribute(attribute, stringBuffer);
- }
- } else {
- super.addAttribute(attribute, stringBuffer);
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/EntitybmpEjbdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/EntitybmpEjbdocletTaskProvider.java
deleted file mode 100644
index 2f74062..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/EntitybmpEjbdocletTaskProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks;
-
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class EntitybmpEjbdocletTaskProvider extends XDocletTaskProviderImpl {
-
- public static String NAMESPACE = "ejbdoclet.entitybmp.";
-
- public String getTask() {
- StringBuffer buffer = new StringBuffer(256);
- buffer.append("<entitybmp ");
- buildAttributes(buffer);
- buffer.append(" />");
- return buffer.toString();
- }
-
- public String getNamespace() {
- return NAMESPACE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/EntitycmpEjbdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/EntitycmpEjbdocletTaskProvider.java
deleted file mode 100644
index 2981f16..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/EntitycmpEjbdocletTaskProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks;
-
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class EntitycmpEjbdocletTaskProvider extends XDocletTaskProviderImpl {
-
- public static String NAMESPACE = "ejbdoclet.entitycmp.";
-
- public String getTask() {
- StringBuffer buffer = new StringBuffer(256);
- buffer.append("<entitycmp ");
- buildAttributes(buffer);
- buffer.append(" />");
- return buffer.toString();
- }
-
- public String getNamespace() {
- return NAMESPACE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/EntitypkEjbdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/EntitypkEjbdocletTaskProvider.java
deleted file mode 100644
index 86cae79..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/EntitypkEjbdocletTaskProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks;
-
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class EntitypkEjbdocletTaskProvider extends XDocletTaskProviderImpl {
-
- public static String NAMESPACE = "ejbdoclet.entitypk.";
-
- public String getTask() {
- StringBuffer buffer = new StringBuffer(256);
- buffer.append("<entitypk ");
- buildAttributes(buffer);
- buffer.append(" />");
- return buffer.toString();
- }
-
- public String getNamespace() {
- return NAMESPACE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/HomeInterfaceEjbdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/HomeInterfaceEjbdocletTaskProvider.java
deleted file mode 100644
index 5b8bf66..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/HomeInterfaceEjbdocletTaskProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks;
-
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class HomeInterfaceEjbdocletTaskProvider extends XDocletTaskProviderImpl {
-
- public static String NAMESPACE = "ejbdoclet.homeinterface.";
-
- public String getTask() {
- StringBuffer buffer = new StringBuffer(256);
- buffer.append("<homeinterface ");
- buildAttributes(buffer);
- buffer.append(" />");
- return buffer.toString();
- }
-
- public String getNamespace() {
- return NAMESPACE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/LocalHomeInterfaceEjbdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/LocalHomeInterfaceEjbdocletTaskProvider.java
deleted file mode 100644
index 569eca3..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/LocalHomeInterfaceEjbdocletTaskProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks;
-
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class LocalHomeInterfaceEjbdocletTaskProvider extends XDocletTaskProviderImpl {
-
- public static String NAMESPACE = "ejbdoclet.localhomeinterface.";
-
- public String getTask() {
- StringBuffer buffer = new StringBuffer(256);
- buffer.append("<localhomeinterface ");
- buildAttributes(buffer);
- buffer.append(" />");
- return buffer.toString();
- }
-
- public String getNamespace() {
- return NAMESPACE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/LocalInterfaceEjbdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/LocalInterfaceEjbdocletTaskProvider.java
deleted file mode 100644
index 8f37da9..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/LocalInterfaceEjbdocletTaskProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks;
-
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class LocalInterfaceEjbdocletTaskProvider extends XDocletTaskProviderImpl {
-
- public static String NAMESPACE = "ejbdoclet.localinterface.";
-
- public String getTask() {
- StringBuffer buffer = new StringBuffer(256);
- buffer.append("<localinterface ");
- buildAttributes(buffer);
- buffer.append(" />");
- return buffer.toString();
- }
-
- public String getNamespace() {
- return NAMESPACE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/MdbEjbdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/MdbEjbdocletTaskProvider.java
deleted file mode 100644
index ddf15d5..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/MdbEjbdocletTaskProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks;
-
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class MdbEjbdocletTaskProvider extends XDocletTaskProviderImpl {
-
- public static String NAMESPACE = "ejbdoclet.mdb.";
-
- public String getTask() {
- StringBuffer buffer = new StringBuffer(256);
- buffer.append("<mdb ");
- buildAttributes(buffer);
- buffer.append(" />");
- return buffer.toString();
- }
-
- public String getNamespace() {
- return NAMESPACE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/RemoteInterfaceEjbdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/RemoteInterfaceEjbdocletTaskProvider.java
deleted file mode 100644
index 2aa43fe..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/RemoteInterfaceEjbdocletTaskProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks;
-
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class RemoteInterfaceEjbdocletTaskProvider extends XDocletTaskProviderImpl {
-
- public static String NAMESPACE = "ejbdoclet.remoteinterface.";
-
- public String getTask() {
- StringBuffer buffer = new StringBuffer(256);
- buffer.append("<remoteinterface ");
- buildAttributes(buffer);
- buffer.append(" />");
- return buffer.toString();
- }
-
- public String getNamespace() {
- return NAMESPACE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/SessionEjbdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/SessionEjbdocletTaskProvider.java
deleted file mode 100644
index 9882c47..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/SessionEjbdocletTaskProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks;
-
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class SessionEjbdocletTaskProvider extends XDocletTaskProviderImpl {
-
- public static String NAMESPACE = "ejbdoclet.session.";
-
- public String getTask() {
- StringBuffer buffer = new StringBuffer(256);
- buffer.append("<session ");
- buildAttributes(buffer);
- buffer.append(" />");
- return buffer.toString();
- }
-
- public String getNamespace() {
- return NAMESPACE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/UtilObjectEjbdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/UtilObjectEjbdocletTaskProvider.java
deleted file mode 100644
index e65dc74..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/UtilObjectEjbdocletTaskProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks;
-
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class UtilObjectEjbdocletTaskProvider extends XDocletTaskProviderImpl {
-
- public static String NAMESPACE = "ejbdoclet.utilobject.";
-
- public String getTask() {
- StringBuffer buffer = new StringBuffer(256);
- buffer.append("<utilobject ");
- buildAttributes(buffer);
- buffer.append(" />");
- return buffer.toString();
- }
-
- public String getNamespace() {
- return NAMESPACE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/ValueObjectEjbdocletTaskProvider.java b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/ValueObjectEjbdocletTaskProvider.java
deleted file mode 100644
index 0acd13c..0000000
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/src/org/eclipse/jst/j2ee/xdoclet/runtime/internal/tasks/ValueObjectEjbdocletTaskProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.xdoclet.runtime.internal.tasks;
-
-import org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletTaskProviderImpl;
-
-public class ValueObjectEjbdocletTaskProvider extends XDocletTaskProviderImpl {
-
- public static String NAMESPACE = "ejbdoclet.valueobject.";
-
- public String getTask() {
- StringBuffer buffer = new StringBuffer(256);
- buffer.append("<valueobject ");
- buildAttributes(buffer);
- buffer.append(" />");
- return buffer.toString();
- }
-
- public String getNamespace() {
- return NAMESPACE;
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/.classpath b/tests/org.eclipse.jst.j2ee.ejb.generation.tests/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/.cvsignore b/tests/org.eclipse.jst.j2ee.ejb.generation.tests/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/.project b/tests/org.eclipse.jst.j2ee.ejb.generation.tests/.project
deleted file mode 100644
index 93e1bac..0000000
--- a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.j2ee.ejb.generation.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/about.html b/tests/org.eclipse.jst.j2ee.ejb.generation.tests/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/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
