This commit was manufactured by cvs2svn to create tag 'v200510110915'.
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 8766536..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: 0.7.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 368beae..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-bin.includes = ejb_toc.xml,\
- images/,\
- plugin.xml,\
- topics/,\
- 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 41697bc..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" href="topics/tecrte.html">
- <topic label="Creating session beans" href="topics/tesessb.html"/>
- <topic label="Creating message-driven beans" 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 dcef5dc..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/cearch.html
+++ /dev/null
@@ -1,150 +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">Enterprise beans</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><span class="uicontrol">Session beans</span>: <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><span class="uicontrol">Entity beans</span>: <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><span class="uicontrol">Message-driven beans</span>: <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">Remote client view</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><span class="uicontrol">Remote interface</span>: The <em>remote interface</em> specifies
-the remote business methods that a client can call on an enterprise bean.</li>
-<li><span class="uicontrol">Remote home interface</span>: 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">Local client view</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><span class="uicontrol">Local interface</span>: 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><span class="uicontrol">Local home interface</span>: 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>
-<dt class="dlterm">Web service client view</dt>
-<dd>In the EJB 2.1 specification, the EJB architecture introduced the support
-for Web services. A client for a session bean can be a Web service client.
-A Web service client can make use of the Web service client view of a stateless
-session bean, which has a corresponding service endpoint interface.<dl><dt class="dlterm">Service endpoint interface</dt>
-<dd>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>
-</dd>
-</dl>
-</dd>
-</dl>
-<dl><dt class="dlterm">EJB client JAR file</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">EJB container</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>
-<dt class="dlterm">Deployment descriptor</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>
-<dt class="dlterm">EJB server</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>
-</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 80e1018..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/ceclientjars.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<!-- /*******************************************************************************
- * 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. Use the Java JAR dependencies editor to update dependencies.
-Best practice is to only create references to the EJB project for backwards
-compatibility. See <a href="../../org.eclipse.jst.j2ee.doc/topics/tjdepend.html">Specifying dependent JAR files or modules</a> for
-more information.</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"><span class="notetitle">Note: </span>The relative
-URI path for the EJB client JAR file should be the same in all applications
-that the EJB project belongs to.</div>
-</div>
-<p>When you create an EJB client JAR project for an EJB project, the EJB client
-JAR file is added to the containing enterprise application as a project utility
-JAR. The reference to this EJB client JAR file cannot be removed from the
-enterprise application as long as the EJB project is defined as a module for
-the application.</p>
-<div class="important"><span class="importanttitle">Important: </span>If you use the Export EJB JAR file wizard to export an EJB
-project, the export wizard does not include an EJB project's associated EJB
-client JAR project. To include the EJB client JAR file, it is recommended
-that you export the enterprise application EAR file that contains the EJB
-project. The resulting EAR file will include any dependent EJB client JAR
-files as utility JAR files. Alternatively, you can export the EJB client JAR
-project separately as a JAR file.</div>
-</div>
-<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 762b1d8..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/ceover.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<!-- /*******************************************************************************
- * 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">J2EE perspective</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>
-<dt class="dlterm">Creating enterprise beans</dt>
-<dd>The EJB tools help you create enterprise beans (either with or without
-inheritance), 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">Validating enterprise bean code</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 0456ce4..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/ceresrc.html
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<!-- /*******************************************************************************
- * 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">EJB modules</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"><span class="notetitle">Note: </span>If
-you choose to create an EJB client JAR file for your EJB module, the client
-interface classes for the enterprise beans will not be included in the EJB
-JAR file, but are included in the EJB client JAR file.</div>
-</dd>
-<dt class="dlterm">EJB projects</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. In the Project Explorer view, an EJB project
-is shown as an EJB module.</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. The source and the output
-files of the project are located in the <span class="uicontrol">ejbModule</span> folder.
-As you make changes and generate deployment code, the Java classes
-are compiled into the <span class="uicontrol">ejbModule</span> folder. You cannot
-use the EJB project as the source folder; doing so will cause errors.</p>
-<div class="note"><span class="notetitle">Note: </span>If
-you choose to create an EJB client JAR file for your EJB module, the client
-interface classes for the enterprise beans will not be included in the EJB
-project, but in separate EJB client JAR project. EJB client JAR projects are
-displayed in the Project Explorer as Java projects under the Other projects node.</div>
-</dd>
-<dt class="dlterm">EJB client projects</dt>
-<dd> <p>The EJB tooling supports the creation of EJB client JAR projects for
-EJB modules. An EJB client JAR project contains all the interface classes
-that a client program needs to use the client views of the enterprise beans
-that are contained in the EJB project. When you create an EJB client project
-for an EJB project, a new Java project is created and added to your
-workspace. The EJB client project is added as a project utility JAR file to
-each module that the EJB project belongs to.</p>
-<p>By default, when you use
-the wizard to create an EJB project, an EJB client JAR project is also created.
-However, you can clear this option in the wizard.</p>
-<div class="tip"><span class="tiptitle">Tip: </span>You
-can also add the EJB client project to another enterprise application that
-does not include the EJB project as a module. This will ensure that the EJB
-client JAR file is exported and packaged with the EAR file when the application
-is exported.</div>
-</dd>
-<dt class="dlterm">Enterprise beans</dt>
-<dd> <p>An enterprise bean is a Java component that can be combined with
-other resources to create distributed client/server applications.</p>
-<p>There
-are three types of enterprise beans: entity beans, session beans, and message-driven
-beans. Typically, all types of beans are used together within an enterprise
-application.</p>
-<dl><dt class="dlterm">Entity beans</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">Session beans</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>
-<dt class="dlterm">Message-driven beans</dt>
-<dd>Message-driven beans are a special kind of enterprise bean that acts as
-a message consumer 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>
-<p>Beans requiring data access use <em>data sources</em>, administrative
-resources defining pools of database connections.</p>
-</dd>
-<dt class="dlterm">Deployment descriptors</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 <span class="uicontrol">META-INF</span> 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 9614769..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</title>
-</head>
-<body id="tecrte"><a name="tecrte"><!-- --></a>
-
-<h1 class="topictitle1">Creating enterprise beans</h1>
-<div><p>You can use a wizard to create session beans and message-driven
-beans.</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 e32429d..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/tecrtpro.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<!-- /*******************************************************************************
- * 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 <span class="menucascade"><span class="uicontrol">File</span> > <span class="uicontrol">New</span> > <span class="uicontrol">Other</span> > <span class="uicontrol">EJB</span> > <span class="uicontrol">EJB Project</span></span>. The New EJB Project wizard
-opens.</span></li>
-<li class="stepexpand"><span>In the <span class="uicontrol">Name</span> field, type a name for the EJB
-project. To change the default <span class="uicontrol">Project location</span>, click
-the <span class="uicontrol">Browse</span> button to select a new location.</span> <p>If
-you specify a non-default project location that is already being used by another
-project, the project creation will fail.</p>
-</li>
-<li class="stepexpand"><span>Click <span class="uicontrol">Show Advanced</span>.</span></li>
-<li class="stepexpand"><span>In the <span class="uicontrol">Target server</span> drop-down list, select
-the application server that you want to target for your development. This
-selection affects the compilation and runtime settings by modifying the class
-path entries for the project.</span></li>
-<li class="stepexpand"><span>In the <span class="uicontrol">EJB version</span> drop-down list, select
-the EJB specification version to which you want your EJB project to adhere.</span> <div class="note"><span class="notetitle">Note: </span>If you plan on using EJB 2.1 enterprise beans, you must specify
-an EJB 2.1 project. You can add EJB 1.1 enterprise beans to EJB 2.x projects.
-An EJB 2.1 project must exist in a J2EE 1.4 enterprise application project.
-An EJB 2.0 project requires a minimum level of J2EE 1.3 for its enterprise
-application project.</div>
-</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 <span class="uicontrol">EAR application</span> combination box,
-type a new project name or select an existing enterprise application project
-from the drop-down list. Or, click the <span class="uicontrol">New</span> button to
-launch the New Enterprise Application Project wizard.</span> <div class="note"><span class="notetitle">Note: </span>If
-you type a new EAR project name, the EAR project will be created in the default
-location with the lowest compatible J2EE version based on the version of the
-project being created. If you want to specify a different version or a different
-location for the enterprise application, you must use the New Enterprise Application
-Project wizard.</div>
-</li>
-<li class="stepexpand"><strong>Optional: </strong><span>Select the <span class="uicontrol">Create an EJB Client
-JAR Project to hold the client interfaces and classes</span> check box
-if you want the client interface classes for your enterprise beans to be kept
-in a separate EJB client JAR file. This EJB client JAR file will be added
-to the enterprise application as a project utility JAR file. </span></li>
-<li class="stepexpand"><strong>Optional: </strong><span>Select the <span class="uicontrol">Add support for annotated
-Java classes</span> check box if you want the generated classes to use
-XDoclet annotations.</span></li>
-<li class="stepexpand"><span>If you are creating an EJB Client JAR project, click <span class="uicontrol">Next</span> to
-specify the client JAR project options. Otherwise, click <span class="uicontrol">Finish</span>.</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 56a8479..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
-module into an EJB JAR file.</p>
-<div class="section"><p>When you export an EJB module, or project, the contents of the
-project are exported into an EJB JAR file regardless of whether deployment
-code has been generated or not. You can use the exported server-side JAR file
-as the client JAR file, since it contains all of the required code from both
-a server-side and client-side perspective.</p>
-<div class="important" id="teexp__exportEJBClientJAR"><a name="teexp__exportEJBClientJAR"><!-- --></a><span class="importanttitle">Important: </span>If you use the Export EJB JAR file wizard to export an EJB
-project, the export wizard does not include an EJB project's associated EJB
-client JAR project. To include the EJB client JAR file, it is recommended
-that you export the enterprise application EAR file that contains the EJB
-project. The resulting EAR file will include any dependent EJB client JAR
-files as utility JAR files. Alternatively, you can export the EJB client JAR
-project separately as a JAR file.</div>
-<p>To export an EJB project:</p>
-</div>
-<ol><li class="stepexpand"><span>In the Project Explorer view of the J2EE perspective, right-click
-the EJB module that you want to export.</span></li>
-<li class="stepexpand"><span>Select <span class="menucascade"><span class="uicontrol">Export</span> > <span class="uicontrol">EJB
-JAR file</span></span> from the pop-up menu. The Export wizard
-opens.</span> </li>
-<li class="stepexpand"><span>Select the EJB module to export from the drop-down list.</span></li>
-<li class="stepexpand"><span>In the <span class="uicontrol">Destination</span> field, provide the full
-path and JAR file name for the exported EJB module.</span></li>
-<li class="stepexpand"><strong>Optional: </strong><span>To include source files in the exported JAR
-file, select the <span class="uicontrol">Export source files</span> check box.</span></li>
-<li 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 <span class="uicontrol">Overwrite
-existing files without warning</span></span></li>
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span>.</span></li>
-</ol>
-<div class="section"> <p>To deploy your EJB JAR file to an application server after you
-export it, you need to use the deployment tools provided by the vendor of
-that server.</p>
-</div>
-</div>
-<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 def8352..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/teimp.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<!-- /*******************************************************************************
- * 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="section"> <div class="tip"><span class="tiptitle">Tip: </span>In the Project Explorer view you can also copy
-enterprise beans by dragging and dropping them from one EJB project to another
-EJB project. The import wizard will open to help you merge existing enterprise
-beans.</div>
-<div class="tip"><span class="tiptitle">Tip: </span><img src="../images/ycwin.gif" alt="The following paragraph applies to Windows." /> You can quickly drag
-and drop an EJB JAR file from the Windows<sup>®</sup> Explorer or desktop onto the
-Project Explorer view. The Import wizard will open with appropriate fields
-already populated. If you drop on an existing EJB module, the wizard will
-import into that EJB module. If you drop on an enterprise application, the
-wizard will bind the new EJB module to this EAR.</div>
-<p>To import an EJB
-JAR file into an EJB project using the Import wizard:</p>
-</div>
-<ol><li class="stepexpand"><span>In the J2EE perspective, click <span class="menucascade"><span class="uicontrol">File</span> > <span class="uicontrol">Import</span> > <span class="uicontrol">EJB JAR file</span></span> and
-click <span class="uicontrol">Next</span>.</span></li>
-<li class="stepexpand"><span>In the <span class="uicontrol">EJB JAR file</span> combination box, enter
-the location and name of the EJB JAR file that you want to import. You can
-click the <span class="uicontrol">Browse</span> button to select the JAR file from
-the file system.</span></li>
-<li class="stepexpand"><span>In the <span class="uicontrol">EJB module</span> combination box, type
-a new project name or select an EJB module from the drop-down list. </span></li>
-<li class="stepexpand"><span>In the <span class="uicontrol">Target server</span> drop-down list, select
-the application server that you want to target for your development. If no
-Target servers exist, create one using the <span class="uicontrol">New</span> button.</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 <span class="uicontrol">EAR application</span> combination box,
-type a new project name or select an existing enterprise application project
-from the drop-down list. Or, click the <span class="uicontrol">New</span> button to
-launch the New Enterprise Application Project wizard.</span> <div class="note"><span class="notetitle">Note: </span>If
-you type a new 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 <span class="uicontrol">Finish</span> to import the
-EJB JAR file.</span></li>
-</ol>
-<div class="section"><div class="note"><span class="notetitle">Note: </span>The .ser files in an EJB 1.0 JAR are converted into the ejb-jar.xml
-file for EJB 1.1 during an import.</div>
-</div>
-</div>
-<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 0cb6994..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/temessb.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<!-- /*******************************************************************************
- * 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</title>
-</head>
-<body id="temessb"><a name="temessb"><!-- --></a>
-
-<h1 class="topictitle1">Creating message-driven beans</h1>
-<div><p>You can use a wizard to create a message-driven bean and add it
-to your project.</p>
-<div class="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 <span class="menucascade"><span class="uicontrol">File</span> > <span class="uicontrol">New</span> > <span class="uicontrol">Other</span> > <span class="uicontrol">EJB</span> > <span class="uicontrol">Enterprise JavaBean</span></span>. The Create an Enterprise
-Bean wizard appears.</span></li>
-<li class="stepexpand"><span>Select the <span class="uicontrol">MessageDrivenBean</span> radio button.</span></li>
-<li class="stepexpand"><span>Click <span class="uicontrol">Next</span>.</span></li>
-<li class="stepexpand"><span>Select the <span class="uicontrol">Project</span> that will contain the
-new bean.</span></li>
-<li class="stepexpand"><span>Select a <span class="uicontrol">Module Name</span>, or use the <span class="uicontrol">New</span> button
-to create one.</span></li>
-<li class="stepexpand"><span>In the <span class="uicontrol">Folder</span> field, select the folder for
-the new bean.</span></li>
-<li class="stepexpand"><span>In the <span class="uicontrol">Java package</span> field, enter the package
-name for the new bean.</span></li>
-<li class="stepexpand"><span>In the <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"><span class="notetitle">Note: </span>You can use Unicode characters for the bean name, but Unicode
-characters are not supported for enterprise bean packages and classes associated
-with enterprise beans.</div>
-</li>
-<li class="stepexpand"><span>Change the <span class="uicontrol">Superclass</span> for the bean if you
-want it to inherit from a class other than <samp class="codeph">java.lang.Object</samp>.</span></li>
-<li class="stepexpand"><span>Click <span class="uicontrol">Next</span>.</span></li>
-<li class="stepexpand"><span>Provide an <span class="uicontrol">EJB Name</span> for the bean.</span> This is the name of the enterprise bean class.</li>
-<li class="stepexpand"><span>Provide an <span class="uicontrol">JNDI Name</span> 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 <span class="uicontrol">Display Name</span> 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 <span class="uicontrol">Description</span> for the bean.</span></li>
-<li class="stepexpand"><span>For message-driven beans, the setting for<span class="uicontrol">State type</span> is
-ignored.</span></li>
-<li class="stepexpand"><span>Select a <span class="uicontrol">Transaction Type</span> for the new bean:</span><ul><li><span class="uicontrol">Container</span> specifies that the transaction demarcation
-is performed by the container.</li>
-<li><span class="uicontrol">Bean</span> specifies that the transaction demarcation
-is performed by the bean.</li>
-</ul>
-</li>
-<li class="stepexpand"><span>Click <span class="uicontrol">Next</span>.</span></li>
-<li class="stepexpand"><span>Select the type of <span class="uicontrol">Modifiers</span> to use for
-the class. Choices are <span class="uicontrol">Public</span>, <span class="uicontrol">Abstract</span>,
-and <span class="uicontrol">Final</span>.</span></li>
-<li class="stepexpand"><span>Select the <span class="uicontrol">Interfaces</span> you want the bean
-to implement:</span><ul><li>Click the <span class="uicontrol">Add</span> 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 <span class="uicontrol">main</span>, <span class="uicontrol">Inherited abstract methods</span>,
-and <span class="uicontrol">Constructors from the superclass</span>.</span></li>
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span>.</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 b3a79e1..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/tesessb.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<!-- /*******************************************************************************
- * 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</title>
-</head>
-<body id="tesessb"><a name="tesessb"><!-- --></a>
-
-<h1 class="topictitle1">Creating session beans</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 <span class="menucascade"><span class="uicontrol">File</span> > <span class="uicontrol">New</span> > <span class="uicontrol">Other</span> > <span class="uicontrol">EJB</span> > <span class="uicontrol">Enterprise JavaBean</span></span>. The Create an Enterprise
-Bean wizard appears.</span></li>
-<li class="stepexpand"><span>Select the <span class="uicontrol">SessionBean</span> radio button.</span></li>
-<li class="stepexpand"><span>Click <span class="uicontrol">Next</span>.</span></li>
-<li class="stepexpand"><span>Select the <span class="uicontrol">Project</span> that will contain the
-new session bean.</span></li>
-<li class="stepexpand"><span>Select a <span class="uicontrol">Module Name</span>, or use the <span class="uicontrol">New</span> button
-to create one.</span></li>
-<li class="stepexpand"><span>In the <span class="uicontrol">Folder</span> field, select the folder for
-the new bean.</span></li>
-<li class="stepexpand"><span>In the <span class="uicontrol">Java package</span> field, enter the package
-name for the new bean.</span></li>
-<li class="stepexpand"><span>In the <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"><span class="notetitle">Note: </span>You can use Unicode characters for the bean name, but Unicode
-characters are not supported for enterprise bean packages and classes associated
-with enterprise beans.</div>
-</li>
-<li class="stepexpand"><span>Change the <span class="uicontrol">Superclass</span> for the bean if you
-want it to inherit from a class other than <samp class="codeph">java.lang.Object</samp>.</span></li>
-<li class="stepexpand"><span>Click <span class="uicontrol">Next</span>.</span></li>
-<li class="stepexpand"><span>Provide an <span class="uicontrol">EJB Name</span> for the bean.</span> This is the name of the enterprise bean class.</li>
-<li class="stepexpand"><span>Provide an <span class="uicontrol">JNDI Name</span> 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 <span class="uicontrol">Display Name</span> 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 <span class="uicontrol">Description</span> for the bean.</span></li>
-<li class="stepexpand"><span>Select the <span class="uicontrol">State type</span> for the new bean:</span><ul><li>A <span class="uicontrol">Stateful</span> session bean maintains client-specific
-session information, or conversational state, across multiple method calls
-and transactions. An instance of a stateful session bean has a unique identity
-that is assigned by the container at create time.</li>
-<li>A <span class="uicontrol">Stateless</span> session bean does not maintain
-conversational state. Instances of a stateless session bean have no conversational
-state. All instances of a stateless session bean have the same object identifier,
-which is assigned by the container.</li>
-</ul>
-</li>
-<li class="stepexpand"><span>Select a <span class="uicontrol">Transaction Type</span> for the new bean:</span><ul><li><span class="uicontrol">Container</span> specifies that the transaction demarcation
-is performed by the container.</li>
-<li><span class="uicontrol">Bean</span> specifies that the transaction demarcation
-is performed by the bean.</li>
-</ul>
-</li>
-<li class="stepexpand"><span>Click <span class="uicontrol">Next</span>.</span></li>
-<li class="stepexpand"><span>Select the type of <span class="uicontrol">Modifiers</span> to use for
-the class. Choices are <span class="uicontrol">Public</span>, <span class="uicontrol">Abstract</span>,
-and <span class="uicontrol">Final</span>.</span></li>
-<li class="stepexpand"><span>Select the <span class="uicontrol">Interfaces</span> you want the bean
-to implement:</span><ul><li>Click the <span class="uicontrol">Add</span> 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 <span class="uicontrol">main</span>, <span class="uicontrol">Inherited abstract methods</span>,
-and <span class="uicontrol">Constructors from the superclass</span>.</span></li>
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span>.</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 3f1e01a..0000000
--- a/docs/org.eclipse.jst.ejb.doc.user/topics/txdocletconf.html
+++ /dev/null
@@ -1,41 +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 Java 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="section">To configure XDoclet to work with the workbench:</div>
-<ol><li class="stepexpand"><span>Click <span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol">Preferences</span> > <span class="uicontrol">J2EE Annotations </span> > <span class="uicontrol">XDoclet</span></span> to
-open the XDoclet Runtime Preferences page.</span></li>
-<li class="stepexpand"><span>Check the <span class="uicontrol">Enable XDoclet Builder</span> check box
- to turn on annotation-based artifact creation.</span></li>
-<li class="stepexpand"><span>Select the <span class="uicontrol">Version</span> of XDoclet that you have
-installed. </span> Supported versions include 1.2.1, 1.2.2, 1.2.3.</li>
-<li class="stepexpand"><span>Use the Browse button to locate the installation directory for
-XDoclet (<strong>XDoclet Home</strong>). </span></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 405f005..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-temp.folder
-build.xml
-ejb_ui.jar
-@dot
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 cfb1fe8..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,34 +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: 0.7.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.plugin,
- org.eclipse.jst.ejb.ui.internal.deployables,
- org.eclipse.jst.ejb.ui.internal.util,
- org.eclipse.jst.ejb.ui.internal.wizard
-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
-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 c8e13cb..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.internal.wizard.EJBComponentCreationWizard;
-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.getResourceString("NewEJBModuleAction_UI_0"); //$NON-NLS-1$
- 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 EJBComponentCreationWizard();
- }
-
- 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 5da4059..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/deployables/EJBDeployableArtifactAdapterFactory.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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 30982fb..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/plugin/EJBUIPlugin.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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 79cf0ca..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/util/EJBUIMessages.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.util;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.wst.common.frameworks.internal.Messages;
-
-
-public class EJBUIMessages extends Messages {
-
- /**
- * The constructor.
- */
- private EJBUIMessages() {
- super();
- }
-
- public static final String IMAGE_LOAD_ERROR = "0"; //$NON-NLS-1$
- public static final String EJB_PROJECT_WIZ_TITLE = "1"; //$NON-NLS-1$
- public static final String EJB_VERSION_LBL = "2"; //$NON-NLS-1$
- public static final String EJB_PROJECT_MAIN_PG_TITLE = "3"; //$NON-NLS-1$
- public static final String EJB_PROJECT_MAIN_PG_DESC = "4"; //$NON-NLS-1$
- public static final String EJB_IMPORT_MAIN_PG_DESC = "5"; //$NON-NLS-1$
- public static final String EJB_IMPORT_MAIN_PG_TITLE = "6"; //$NON-NLS-1$
- public static final String EJB_JAR_FILE_LBL = "7"; //$NON-NLS-1$
- public static final String EJB_PROJECT_LBL = "8"; //$NON-NLS-1$
- public static final String EJB_EXPORT_MAIN_PG_TITLE = "9"; //$NON-NLS-1$
- public static final String EJB_EXPORT_MAIN_PG_DESC = "10"; //$NON-NLS-1$
- public static final String EJB_Client_Title = "11"; //$NON-NLS-1$
- public static final String EJB_Client_Desc = "12"; //$NON-NLS-1$
- public static final String Client_JAR_URI = "13"; //$NON-NLS-1$
- public static final String Project_name = "14"; //$NON-NLS-1$
- public static final String Project_location = "15"; //$NON-NLS-1$
- public static final String EJB_Project = "16"; //$NON-NLS-1$
- public static final String DELETE_BEAN_ONLY = "17"; //$NON-NLS-1$
- public static final String Delete_Bean_Classes_UI = "18"; //$NON-NLS-1$
- public static final String Delete_Access_Bean = "19"; //$NON-NLS-1$
- public static final String Delete_Deployed_Code = "20"; //$NON-NLS-1$
- public static final String Select_All_UI = "21"; //$NON-NLS-1$
- public static final String Deselect_All_UI = "22"; //$NON-NLS-1$
- public static final String The_selected_Enterprise_Be = "23"; //$NON-NLS-1$
- public static final String Delete = "24"; //$NON-NLS-1$
- public static final String Cannot_delete_Enterprise_B = "25"; //$NON-NLS-1$
- public static final String Cannot_delete_bean = "26"; //$NON-NLS-1$
- public static final String Delete_Enterprise_Beans = "27"; //$NON-NLS-1$
- public static final String Delete_Options_Query = "27"; //$NON-NLS-1$
-
-
- private static EJBUIMessages INSTANCE = new EJBUIMessages();
-
- /**
- * Returns the string from the resource bundle, or 'key' if not found.
- */
- public static String getResourceString(String key) {
- return INSTANCE.doGetResourceString(key);
- }
-
- public static String getResourceString(String key, Object[] args) {
- return INSTANCE.doGetResourceString(key, args);
- }
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.Messages#initializeBundle()
- */
- protected void initializeBundle() {
- try {
- resourceBundle = ResourceBundle.getBundle("ejb_ui"); //$NON-NLS-1$
- } catch (MissingResourceException x) {
- //Ignore
- }
- }
-
-}
\ 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 4e1c1c7..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.EJBClientComponentDataModelProvider;
-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.getResourceString(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 EJBClientComponentDataModelProvider();
- }
-
-}
\ 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 e22c42f..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBClientComponentCreationWizardPage.java
+++ /dev/null
@@ -1,182 +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.ejb.datamodel.properties.IEJBClientComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-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 IEJBClientComponentCreationDataModelProperties{
- 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;
-
- /**
- * @param model
- * @param pageName
- */
- public EJBClientComponentCreationWizardPage(IDataModel model, String pageName) {
- super(model, pageName);
- setTitle(EJBUIMessages.getResourceString(EJBUIMessages.EJB_Client_Title)); //$NON-NLS-1$
- setDescription(EJBUIMessages.getResourceString(EJBUIMessages.EJB_Client_Desc)); //$NON-NLS-1$
- }
-
- /**
- * @param model
- * @param pageName
- * @param title
- * @param titleImage
- */
- public EJBClientComponentCreationWizardPage(IDataModel model, String pageName, String title, ImageDescriptor titleImage) {
- super(model, pageName, title, titleImage);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
- */
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- setInfopopID(IJ2EEUIContextIds.NEW_EJB_WIZARD_P2);
- createNewJ2EEModuleGroup(composite);
- createClientGroup(composite);
- handleHasClientJar();
- return composite;
- }
-
- private void createClientGroup(Composite parent) {
- Composite newComposite = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- newComposite.setLayout(layout);
- createEJBComponentSection(newComposite);
- clientJarURILabel = new Label(newComposite, SWT.NULL);
- clientJarURILabel.setText(EJBUIMessages.getResourceString(EJBUIMessages.Client_JAR_URI) + " "); //$NON-NLS-1$
-
- GridData data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = 305;
- clientJarURI = new Text(newComposite, SWT.BORDER);
- clientJarURI.setEditable(true);
- clientJarURI.setLayoutData(data);
- synchHelper.synchText(clientJarURI, CLIENT_COMPONENT_URI, new Control[]{clientJarURILabel});
- }
-
- private void createEJBComponentSection(Composite parent) {
-
- GridData data = new GridData();
- setSpacer(parent);
- selectedProjectLabel = new Label(parent, SWT.NULL);
- selectedProjectLabel.setText(EJBUIMessages.getResourceString(EJBUIMessages.EJB_Project)); //$NON-NLS-1$
-
- data.widthHint = 305;
- selectedProjectName = new Text(parent, SWT.NULL);
- selectedProjectName.setLayoutData(data);
- selectedProjectName.setEditable(false);
- synchHelper.synchText(selectedProjectName, EJB_COMPONENT_NAME, new Control[]{selectedProjectLabel});
- }
-
- protected void createNewJ2EEModuleGroup(Composite parent) {
- Composite newComposite = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout();
- layout.numColumns = 3;
- newComposite.setLayout(layout);
- newModuleGroup = new NewModuleGroup(newComposite, SWT.NULL, model, synchHelper);
- }
-
- private void setSpacer(Composite composite) {
- Label space = new Label(composite, SWT.NONE);
- GridData data = new GridData(GridData.FILL_HORIZONTAL);
- space.setLayoutData(data);
-
- space = new Label(composite, SWT.NONE);
- data = new GridData(GridData.FILL_HORIZONTAL);
- space.setLayoutData(data);
- }
-
- 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_COMPONENT_NAME, CLIENT_COMPONENT_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();
- }
-}
\ 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 22381ec..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBComponentCreationWizard.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.wizard;
-
-import org.eclipse.jface.wizard.IWizardPage;
-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;
-
-/**
- * <p>
- * Wizard used to create J2EE Enterprise Java Bean
- * (EJB) module structures in Eclipse Projects.
- * </p>
- */
-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.getResourceString(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>
- *
- * @see org.eclipse.jface.wizard.IWizard#getNextPage(org.eclipse.jface.wizard.IWizardPage)
- */
- public IWizardPage getNextPage(IWizardPage page) {
- IWizardPage nextPage = super.getNextPage(page);
- if (nextPage != null && nextPage.getName().equals(CLIENT_PG) && shouldSkipClientPage())
- return super.getNextPage(nextPage);
- return nextPage;
- }
-
-
- /**
- * {@inheritDoc}
- *
- * <p>
- * Skips the EJB Client settings page based on the return value of shouldSkipClientPage()
- * </p>
- *
- * @see org.eclipse.jface.wizard.IWizard#getPreviousPage(org.eclipse.jface.wizard.IWizardPage)
- */
- public IWizardPage getPreviousPage(IWizardPage page) {
- IWizardPage previousPage = super.getPreviousPage(page);
- if (previousPage != null && previousPage.getName().equals(CLIENT_PG) && shouldSkipClientPage()) {
- IWizardPage temp = getPage(MAIN_PG);
- if (temp != null)
- return temp;
- }
- return previousPage;
- }
-
- /**
- * {@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 9ec86b9..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.getResourceString(EJBUIMessages.EJB_PROJECT_MAIN_PG_TITLE));
- setDescription(EJBUIMessages.getResourceString(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.getResourceString(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 58fac1d..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.getResourceString(EJBUIMessages.EJB_IMPORT_MAIN_PG_TITLE));
- setDescription(EJBUIMessages.getResourceString(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.getResourceString(EJBUIMessages.EJB_JAR_FILE_LBL);
- }
-
- protected String[] getFilterExpression() {
- return new String[]{"*.jar"}; //$NON-NLS-1$
- }
-
- protected String getProjectImportLabel() {
- return EJBUIMessages.getResourceString(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 a359ede..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.getResourceString(EJBUIMessages.EJB_EXPORT_MAIN_PG_TITLE));
- setDescription(EJBUIMessages.getResourceString(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 2e3b2d4..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBFiguresResourceHandler.java
+++ /dev/null
@@ -1,65 +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 May 24, 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.wizard;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.wst.common.frameworks.internal.Messages;
-
-
-/**
- * @author vijayb
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public class EJBFiguresResourceHandler extends Messages {
- private static EJBFiguresResourceHandler INSTANCE = new EJBFiguresResourceHandler();
-
- /**
- * The constructor.
- */
- private EJBFiguresResourceHandler() {
- super();
- }
-
- /**
- * Returns the string from the resource bundle, or 'key' if not found.
- */
- public static String getResourceString(String key) {
- return INSTANCE.doGetResourceString(key);
- }
-
- public static String getResourceString(String key, Object[] args) {
- return INSTANCE.doGetResourceString(key, args);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.Messages#initializeBundle()
- */
- protected void initializeBundle() {
- try {
- resourceBundle = ResourceBundle.getBundle("ejb_figures"); //$NON-NLS-1$
- } catch (MissingResourceException x) {
- //Ignore
- }
- }
-
-}
\ 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 8c0295a..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/plugin.xml
+++ /dev/null
@@ -1,363 +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.internal.wizard.EJBComponentCreationWizard"
- project="true"
- id="org.eclipse.jst.ejb.ui.EJBComponentCreationWizard">
- <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>
-</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 f6dca9d..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/property_files/ejb_ui.properties
+++ /dev/null
@@ -1,43 +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
-###############################################################################
-0=Failed to find the image "{0}".
-1=New EJB Project
-2=EJB version:
-3=EJB Module
-4=Create an EJB Project and add it to a new or existing Enterprise Application.
-5=Import an EJB jar from the file system
-6=EJB Jar Import
-7=EJB Jar file:
-8=EJB module:
-9=EJB Jar Export
-10=Export EJB project to the local file system.
-11=EJB client JAR Creation
-12=Use this wizard to create an EJB client JAR from your existing EJB
-13=Client JAR URI:
-14=Project name:
-15=Project location:
-16=EJB module:
-17=Delete Bean Only
-18=Delete Bean Classes
-19=Delete Access Bean
-20=Delete Deployed Code
-21=Select All
-22=Deselect All
-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.
-24=Delete...
-25=Cannot delete Enterprise Bean
-26=Cannot delete the bean named "{0}" because it is in a binary project.
-27=Delete Enterprise Bean(s)
-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 Module
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 1290563..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-temp.folder
-*.jar
-build.xml
-@dot
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 5598536..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: 0.7.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.ui,
- org.eclipse.jst.common.frameworks
-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 0862a46..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/plugin.xml
+++ /dev/null
@@ -1,19 +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>
-</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 3c74fb8..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/schema/ejbGenerator.exsd
+++ /dev/null
@@ -1,104 +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="org.eclipse.jst.j2ee.ejb.generator"/>
- </appInfo>
- <documentation>
- This extension permits definitions for new types of EJB generators into JST
- </documentation>
- </annotation>
-
- <element name="ejbGenerator">
- <complexType>
- <sequence>
- </sequence>
- <attribute name="name" type="string">
- <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>
- </complexType>
- </element>
-
- <element name="provider">
- <complexType>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- R0.7
- </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>
- The ejb generator class must implement the IEJBGenerator interface
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- WTP provides an defaul example implementation using XDoclet for ejb generation.
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
-
- </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 8149e9d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/messages/EJBAnnotationMessages.java
+++ /dev/null
@@ -1,55 +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 java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.wst.common.frameworks.internal.Messages;
-
-
-public class EJBAnnotationMessages extends Messages {
-
- public static final String IMAGE_LOAD_ERROR = "0"; //$NON-NLS-1$
-
-
-
- private static final EJBAnnotationMessages INSTANCE = new EJBAnnotationMessages();
-
-
- private EJBAnnotationMessages() {
- super();
- }
-
- /**
- * Returns the string from the resource bundle, or 'key' if not found.
- */
- public static String getResourceString(String key) {
- return INSTANCE.doGetResourceString(key);
- }
-
- public static String getResourceString(String key, Object[] args) {
- return INSTANCE.doGetResourceString(key, args);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.Messages#initializeBundle()
- */
- protected void initializeBundle() {
- try {
- resourceBundle = ResourceBundle.getBundle("web_ui"); //$NON-NLS-1$
- } catch (MissingResourceException x) {
- // Do nothing
- }
- }
-
-}
\ 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 05d5703..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/messages/IEJBAnnotationConstants.java
+++ /dev/null
@@ -1,92 +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.getResourceString("ERR_EJB_CLASS_NAME_USED"); //$NON-NLS-1$
- public static final String ERR_EJB_NAME_EMPTY = EJBAnnotationMessages.getResourceString("ERR_EJB_NAME_EMPTY"); //$NON-NLS-1$
- public static final String ERR_EJB_TYPE_EMPTY = EJBAnnotationMessages.getResourceString("ERR_EJB_TYPE_EMPTY"); //$NON-NLS-1$;
- public static final String ERR_EJB_TYPE_VALUE = EJBAnnotationMessages.getResourceString("ERR_EJB_TYPE_VALUE"); //$NON-NLS-1$;
- public static final String ERR_CLASS_NAME_MUSTEND_WITH_BEAN = EJBAnnotationMessages.getResourceString("ERR_CLASS_NAME_MUSTEND_WITH_BEAN"); //$NON-NLS-1$
- public static final String ERR_EJB_NAME_ENDS_WITH_BEAN = EJBAnnotationMessages.getResourceString("ERR_EJB_NAME_ENDS_WITH_BEAN"); //$NON-NLS-1$
- public static final String ERR_DISPLAY_NAME_EMPTY = EJBAnnotationMessages.getResourceString("ERR_DISPLAY_NAME_EMPTY"); //$NON-NLS-1$
- public static final String ERR_EJB_DISPLAY_NAME_USED = EJBAnnotationMessages.getResourceString("ERR_EJB_DISPLAY_NAME_USED"); //$NON-NLS-1$
- public static final String ERR_STATELESS_EMPTY = EJBAnnotationMessages.getResourceString("ERR_STATELESS_EMPTY"); //$NON-NLS-1$
- public static final String ERR_STATELESS_VALUE = EJBAnnotationMessages.getResourceString("ERR_STATELESS_VALUE"); //$NON-NLS-1$
- public static final String ERR_JNDI_NAME_EMPTY = EJBAnnotationMessages.getResourceString("ERR_JNDI_NAME_EMPTY"); //$NON-NLS-1$
- public static final String ERR_JNDI_NAME_VALUE = EJBAnnotationMessages.getResourceString("ERR_JNDI_NAME_VALUE"); //$NON-NLS-1$
- public static final String ERR_TRANSACTION_EMPTY = EJBAnnotationMessages.getResourceString("ERR_TRANSACTION_EMPTY"); //$NON-NLS-1$
- public static final String ERR_TRANSACTION_VALUE = EJBAnnotationMessages.getResourceString("ERR_TRANSACTION_VALUE"); //$NON-NLS-1$
- public static final String ERR_DESTINATIONTYPE_EMPTY = EJBAnnotationMessages.getResourceString("ERR_DESTINATIONTYPE_EMPTY"); //$NON-NLS-1$
- public static final String ERR_DESTINATIONTYPE_VALUE = EJBAnnotationMessages.getResourceString("ERR_DESTINATIONTYPE_VALUE"); //$NON-NLS-1$
- public static final String ERR_MUST_ENTER_A_PACKAGE_NAME = EJBAnnotationMessages.getResourceString("ERR_MUST_ENTER_A_PACKAGE_NAME"); //$NON-NLS-1$
-
- // AddEjbWizard
- public final static String ADD_EJB_WIZARD_WINDOW_TITLE = EJBAnnotationMessages.getResourceString("ADD_EJB_WIZARD_WINDOW_TITLE"); //$NON-NLS-1$
- public final static String ADD_EJB_WIZARD_PAGE_TITLE = EJBAnnotationMessages.getResourceString("ADD_EJB_WIZARD_PAGE_TITLE"); //$NON-NLS-1$
- public static final String ADD_EJB_WIZARD_PAGE_DESC = EJBAnnotationMessages.getResourceString("ADD_EJB_WIZARD_PAGE_DESC"); //$NON-NLS-1$
-
- public final static String DEFAULT_PACKAGE = EJBAnnotationMessages.getResourceString("DEFAULT_PACKAGE"); //$NON-NLS-1$
- public final static String SELECT_CLASS_TITLE = EJBAnnotationMessages.getResourceString("SELECT_CLASS_TITLE"); //$NON-NLS-1$
-
-
- // common
-
- public final static String EJB_NAME_LABEL = EJBAnnotationMessages.getResourceString("EJB_NAME_LABEL"); //$NON-NLS-1$
- public final static String DESCRIPTION_LABEL = EJBAnnotationMessages.getResourceString("DESCRIPTION_LABEL"); //$NON-NLS-1$
- public static final String NAME_LABEL = EJBAnnotationMessages.getResourceString("NAME_LABEL"); //$NON-NLS-1$;
- public static final String JNDI_NAME_LABEL = EJBAnnotationMessages.getResourceString("JNDI_NAME_LABEL"); //$NON-NLS-1$;
- public static final String STATELESS_LABEL = EJBAnnotationMessages.getResourceString("STATELESS_LABEL"); //$NON-NLS-1$;;
- public static final String TRANSACTION_LABEL = EJBAnnotationMessages.getResourceString("TRANSACTION_LABEL"); //$NON-NLS-1$;;;
- public static final String DESTINATION_LABEL = EJBAnnotationMessages.getResourceString("DESTINATION_LABEL"); //$NON-NLS-1$;;;
- public static final String DESTINATION_NAME_LABEL = EJBAnnotationMessages.getResourceString("DESTINATION_NAME_LABEL"); //$NON-NLS-1$;;;
- public static final String DISPLAY_NAME_LABEL = EJBAnnotationMessages.getResourceString("DISPLAY_NAME_LABEL"); //$NON-NLS-1$;
-
-
- public final static String ADD_BUTTON_LABEL = EJBAnnotationMessages.getResourceString("ADD_BUTTON_LABEL"); //$NON-NLS-1$
- public final static String FOLDER_LABEL = EJBAnnotationMessages.getResourceString("FOLDER_LABEL"); //$NON-NLS-1$
- public final static String JAVA_PACKAGE_LABEL = EJBAnnotationMessages.getResourceString("JAVA_PACKAGE_LABEL"); //$NON-NLS-1$
- public final static String CLASS_NAME_LABEL = EJBAnnotationMessages.getResourceString("CLASS_NAME_LABEL"); //$NON-NLS-1$
- public final static String SUPERCLASS_LABEL = EJBAnnotationMessages.getResourceString("SUPERCLASS_LABEL"); //$NON-NLS-1$
- public final static String CONTAINER_SELECTION_DIALOG_TITLE = EJBAnnotationMessages.getResourceString("CONTAINER_SELECTION_DIALOG_TITLE"); //$NON-NLS-1$
- public final static String CONTAINER_SELECTION_DIALOG_DESC = EJBAnnotationMessages.getResourceString("CONTAINER_SELECTION_DIALOG_DESC"); //$NON-NLS-1$
- public final static String CONTAINER_SELECTION_DIALOG_VALIDATOR_MESG = EJBAnnotationMessages.getResourceString("CONTAINER_SELECTION_DIALOG_VALIDATOR_MESG"); //$NON-NLS-1$
- public final static String PACKAGE_SELECTION_DIALOG_TITLE = EJBAnnotationMessages.getResourceString("PACKAGE_SELECTION_DIALOG_TITLE"); //$NON-NLS-1$
- public final static String PACKAGE_SELECTION_DIALOG_DESC = EJBAnnotationMessages.getResourceString("PACKAGE_SELECTION_DIALOG_DESC"); //$NON-NLS-1$
- public final static String PACKAGE_SELECTION_DIALOG_MSG_NONE = EJBAnnotationMessages.getResourceString("PACKAGE_SELECTION_DIALOG_MSG_NONE"); //$NON-NLS-1$
- public final static String SUPERCLASS_SELECTION_DIALOG_TITLE = EJBAnnotationMessages.getResourceString("SUPERCLASS_SELECTION_DIALOG_TITLE"); //$NON-NLS-1$
- public final static String SUPERCLASS_SELECTION_DIALOG_DESC = EJBAnnotationMessages.getResourceString("SUPERCLASS_SELECTION_DIALOG_DESC"); //$NON-NLS-1$
- public final static String INTERFACE_SELECTION_DIALOG_TITLE = EJBAnnotationMessages.getResourceString("INTERFACE_SELECTION_DIALOG_TITLE"); //$NON-NLS-1$
- public final static String INTERFACE_SELECTION_DIALOG_DESC = EJBAnnotationMessages.getResourceString("INTERFACE_SELECTION_DIALOG_DESC"); //$NON-NLS-1$
- public final static String INTERFACE_SELECTION_DIALOG_MSG_NONE = EJBAnnotationMessages.getResourceString("INTERFACE_SELECTION_DIALOG_MSG_NONE"); //$NON-NLS-1$
- public final static String JAVA_CLASS_MODIFIERS_LABEL = EJBAnnotationMessages.getResourceString("JAVA_CLASS_MODIFIERS_LABEL"); //$NON-NLS-1$
- public final static String JAVA_CLASS_INTERFACES_LABEL = EJBAnnotationMessages.getResourceString("JAVA_CLASS_INTERFACES_LABEL"); //$NON-NLS-1$
- public final static String JAVA_CLASS_METHOD_STUBS_LABEL = EJBAnnotationMessages.getResourceString("JAVA_CLASS_METHOD_STUBS_LABEL"); //$NON-NLS-1$
- public final static String JAVA_CLASS_PUBLIC_CHECKBOX_LABEL = EJBAnnotationMessages.getResourceString("JAVA_CLASS_PUBLIC_CHECKBOX_LABEL"); //$NON-NLS-1$
- public final static String JAVA_CLASS_ABSTRACT_CHECKBOX_LABEL = EJBAnnotationMessages.getResourceString("JAVA_CLASS_ABSTRACT_CHECKBOX_LABEL"); //$NON-NLS-1$
- public final static String JAVA_CLASS_FINAL_CHECKBOX_LABEL = EJBAnnotationMessages.getResourceString("JAVA_CLASS_FINAL_CHECKBOX_LABEL"); //$NON-NLS-1$
- public final static String JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL = EJBAnnotationMessages.getResourceString("JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL"); //$NON-NLS-1$
- public final static String JAVA_CLASS_MAIN_CHECKBOX_LABEL = EJBAnnotationMessages.getResourceString("JAVA_CLASS_MAIN_CHECKBOX_LABEL"); //$NON-NLS-1$
- public final static String JAVA_CLASS_INHERIT_CHECKBOX_LABEL = EJBAnnotationMessages.getResourceString("JAVA_CLASS_INHERIT_CHECKBOX_LABEL"); //$NON-NLS-1$
- public final static String JAVA_CLASS_BROWER_DIALOG_TITLE = EJBAnnotationMessages.getResourceString("JAVA_CLASS_BROWER_DIALOG_TITLE"); //$NON-NLS-1$
- public final static String JAVA_CLASS_BROWER_DIALOG_MESSAGE = EJBAnnotationMessages.getResourceString("JAVA_CLASS_BROWER_DIALOG_MESSAGE"); //$NON-NLS-1$
-
- public final static String VALUE_LABEL = EJBAnnotationMessages.getResourceString("VALUE_LABEL"); //$NON-NLS-1$
- public final static String EMPTY_STRING = ""; //$NON-NLS-1$
- public final static String BROWSE_BUTTON_LABEL = EJBAnnotationMessages.getResourceString("BROWSE_BUTTON_LABEL"); //$NON-NLS-1$
- public static final String REMOVE_BUTTON = EJBAnnotationMessages.getResourceString("REMOVE_BUTTON"); //$NON-NLS-1$
-
- public final static String NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC = EJBAnnotationMessages.getResourceString("NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC"); //$NON-NLS-1$
- public final static String NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC = EJBAnnotationMessages.getResourceString("NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC"); //$NON-NLS-1$
-
- public final static String NO_EJB_PROJECTS = EJBAnnotationMessages.getResourceString("NO_EJB_PROJECTS"); //$NON-NLS-1$
-}
\ 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/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 5cc900a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/EnterpriseBeanClassDataModelProvider.java
+++ /dev/null
@@ -1,365 +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.JavaConventions;
-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 = super.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.getResourceString(J2EECommonMessages.ERR_JAVA_PACAKGE_NAME_INVALID) + javaStatus.getMessage();
- return WTPCommonPlugin.createErrorStatus(msg);
- } else if (javaStatus.getSeverity() == IStatus.WARNING) {
- String msg = J2EECommonMessages.getResourceString(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();
- 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) {
- // check for empty
- if (prop == null || prop.trim().length() == 0) {
- String msg = J2EECommonMessages.getResourceString(J2EECommonMessages.ERR_JAVA_CLASS_NAME_EMPTY, new String[]{prop});
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- if (getTargetProject() == null)// || getComponent()==null)
- return WTPCommonPlugin.OK_STATUS;
- ArtifactEdit edit = null;
- try {
- edit = getArtifactEditForRead();
- 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.getEjbClass().getQualifiedName())) {
- String msg = IEJBAnnotationConstants.ERR_EJB_CLASS_NAME_USED;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- }
- }
- } finally {
- if (edit != null)
- edit.dispose();
- }
-
- return WTPCommonPlugin.OK_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 ceef360..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/EnterpriseBeanDelegate.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.jst.j2ee.ejb.annotation.internal.model;
-
-import java.util.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#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/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 6757f8b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/IEnterpriseBean.java
+++ /dev/null
@@ -1,33 +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();
-
-}
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 1c79b0f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/IEnterpriseBeanClassDataModelProperties.java
+++ /dev/null
@@ -1,25 +0,0 @@
-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 5b861aa..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/IMessageDrivenBeanDataModelProperties.java
+++ /dev/null
@@ -1,12 +0,0 @@
-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 cdd85e8..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/ISessionBeanDataModelProperties.java
+++ /dev/null
@@ -1,10 +0,0 @@
-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 7531f0c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/MessageDrivenBeanDataModelProvider.java
+++ /dev/null
@@ -1,120 +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() {
- return new AddMessageDrivenBeanOperation(getDataModel());
- }
-
- /**
- * Subclasses may extend this method to add their own data model's properties as valid base
- * properties.
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#getPropertyNames()
- */
- public Set 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 340d74e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/ModelPlugin.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.annotation.internal.model;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-
-public class ModelPlugin extends AbstractUIPlugin {
-
- 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;
- }
-}
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 2978f37..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/SessionBeanDataModelProvider.java
+++ /dev/null
@@ -1,111 +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() {
- return new AddSessionBeanOperation(getDataModel());
- }
-
- /**
- * Subclasses may extend this method to add their own data model's properties as valid base
- * properties.
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#getPropertyNames()
- */
- public Set 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/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 c35a3e9..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/preferences/AnnotationPreferenceStore.java
+++ /dev/null
@@ -1,85 +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.jface.preference.IPreferenceStore;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.ModelPlugin;
-
-
-
-
-public class AnnotationPreferenceStore {
-
-
-
- private static IPreferenceStore preferenceStore = null;
-
- public static final String ANNOTATIONPROVIDER = "ANNOTATIONPROVIDER";
-
-
- private static IPreferenceStore getPreferenceStore() {
- if (preferenceStore == null) {
- preferenceStore = ModelPlugin.getDefault().getPreferenceStore();
- }
- return preferenceStore;
- }
-
- public static String getPropertyRaw(String item) {
- return getPreferenceStore().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(IPreferenceStore store)
- {
- String prefix = ModelPlugin.PLUGINID+".";
- store.setDefault(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 096c09d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/provider/IEJBGenerator.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;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-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;
-}
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 2e2c2ea..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/web_ui.properties
+++ /dev/null
@@ -1,98 +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
-
-
-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_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
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/.classpath b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/.cvsignore b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/.cvsignore
deleted file mode 100644
index 22055a5..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-ejbEmitter.jar
-@dot
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/.project b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/.project
deleted file mode 100644
index 89e7f17..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.j2ee.ejb.annotations.emitter</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/META-INF/MANIFEST.MF
deleted file mode 100644
index 921006f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,23 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: EJB Emitter Plug-in
-Bundle-SymbolicName: org.eclipse.jst.j2ee.ejb.annotations.emitter; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.jst.j2ee.ejb.annotations.internal.emitter.EjbEmitterPlugin
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.j2ee.ejb.annotations.internal.classgen,
- org.eclipse.jst.j2ee.ejb.annotations.internal.emitter
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.emf.codegen,
- org.eclipse.jdt.core,
- org.eclipse.jdt.ui,
- org.eclipse.jst.j2ee.core,
- org.eclipse.text,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.ejb.annotation.model,
- org.eclipse.jem.util
-Eclipse-AutoStart: true
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/about.html b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/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.emitter/build.properties b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/build.properties
deleted file mode 100644
index d274aa5..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-bin.includes = plugin.xml,\
- .,\
- META-INF/,\
- about.html
-src.includes = schema/
-source.. = src/
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/plugin.xml b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/plugin.xml
deleted file mode 100644
index 775d6d4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/plugin.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <extension-point id="template" name="template" schema="schema/emitter.exsd"/>
-
-</plugin>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/schema/emitter.exsd b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/schema/emitter.exsd
deleted file mode 100644
index bae7419..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/schema/emitter.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.annotations.provider">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.j2ee.ejb.annotations.provider" id="provider" name="provider"/>
- </appInfo>
- <documentation>
- This extension point allows vendors and developers to provide their templates for annotation based code generation using the wtp framework.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="emitter"/>
- <element ref="provider"/>
- </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="emitter">
- <complexType>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="classpathProvider" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="builderId" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="ejbIntrospector" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="mergeController" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="sessionTemplates" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="entityTemplates" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="messageTemplates" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- Eclipse version 3.1 - In preparation for WebTools Platform project
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- <extension point="com.objectlearn.j2ee.gmf.emitter">
- <emitter
- name="xdoclet"
- classpathProvider="org.emitter.path.MyEmitterClasspathPorvider"
- builderId="org.emitter.path.MyEmitterBuilder"
- sessionTemplates="templates/ejb/session"
- entityTemplates="templates/ejb/entity"
- messageTemplates="templates/ejb/message"
-
- />
- </extension>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- ClasspathProviders registered using this extension point must implement com.objectlearn.j2ee.gmf.emitter.IEmitterClasspathPorvider interface
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- WTP comes with an XDoclet EJB emitter implementation
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2004 Eteration Bilisim A.S.
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/classgen/EjbBuilder.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/classgen/EjbBuilder.java
deleted file mode 100644
index 874bd2d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/classgen/EjbBuilder.java
+++ /dev/null
@@ -1,595 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.jst.j2ee.ejb.annotations.internal.classgen;
-
-import java.util.HashSet;
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.InvalidRegistryObjectException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.emf.codegen.jmerge.JControlModel;
-import org.eclipse.emf.codegen.jmerge.JMerger;
-import org.eclipse.jdt.core.IBuffer;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.ISourceRange;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.compiler.IProblem;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.ASTParser;
-import org.eclipse.jdt.core.dom.ASTVisitor;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Javadoc;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jdt.core.dom.TagElement;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jdt.core.formatter.CodeFormatter;
-import org.eclipse.jdt.internal.corext.codemanipulation.ImportsStructure;
-import org.eclipse.jdt.internal.corext.util.CodeFormatterUtil;
-import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
-import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings;
-import org.eclipse.jdt.ui.CodeGeneration;
-import org.eclipse.jdt.ui.PreferenceConstants;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.IEnterpriseBean;
-import org.eclipse.text.edits.TextEdit;
-
-
-
-
-public class EjbBuilder {
-
- protected IProgressMonitor monitor;
- protected IPackageFragmentRoot packageFragmentRoot;
- protected String packageName = "";
- protected String typeName = "";
- protected String typeStub;
- protected String typeComment;
- protected String methodStub;
- protected String fields;
- protected IConfigurationElement configurationElement;
- protected JControlModel mergeOptions;
-
- protected IEnterpriseBean enterpriseBeanDelegate;
-
- /**
- * @return Returns the mergeOptions.
- * @throws CoreException
- * @throws InvalidRegistryObjectException
- */
- public JControlModel getMergeOptions() throws InvalidRegistryObjectException, CoreException {
- if (mergeOptions == null) {
- if(getConfigurationElement() != null){
- String declaringPlugin = getConfigurationElement().getDeclaringExtension().getNamespace();
- String uri = Platform.getBundle(declaringPlugin).getEntry("/ejb-merge.xml").toString();
- mergeOptions = new JControlModel(uri);
-
- }else{
- mergeOptions = new JControlModel("");
- }
- }
-
- return mergeOptions;
- }
- /**
- * @param mergeOptions The mergeOptions to set.
- */
- public void setMergeOptions(JControlModel mergeOptions) {
- this.mergeOptions = mergeOptions;
- }
- IType fCreatedType ;
-
- public EjbBuilder() {
- super();
- }
-
- public String merge(String sourceSrc, String targetSrc) throws InvalidRegistryObjectException, CoreException
- {
-
- if(targetSrc == null || targetSrc.length() == 0)
- return sourceSrc;
-
- String modifiedTargetSrc = insertMissingComments(sourceSrc, targetSrc);
-
-
- JMerger jMerger = new JMerger();
- jMerger.setControlModel(getMergeOptions());
- jMerger.setSourceCompilationUnit(jMerger.createCompilationUnitForContents(sourceSrc));
- jMerger.setTargetCompilationUnit(jMerger.createCompilationUnitForContents(modifiedTargetSrc));
- jMerger.merge();
-
- return jMerger.getTargetCompilationUnitContents();
-
- }
-
- /**
- * @param sourceSrc
- * @param targetSrc
- */
- private String insertMissingComments(String sourceSrc, String targetSrc) {
- // EMF JMerge does not transfer non-existent member comments
- // without e-completely overwriting the memeber. This phase
- // makes sure that if the target member has no comment, source
- // comment is inserted before the merge
- IDocument document = new Document(targetSrc);
- ASTParser sourceParser = ASTParser.newParser(AST.JLS3);
- sourceParser.setSource(sourceSrc.toCharArray());
- final CompilationUnit sourceAst = (CompilationUnit) sourceParser.createAST(null);
- ASTParser targetParser = ASTParser.newParser(AST.JLS3);
- targetParser.setSource(targetSrc.toCharArray());
- final CompilationUnit targetAst = (CompilationUnit) targetParser.createAST(null);
- targetAst.recordModifications();
-
- class InsertComments extends ASTVisitor {
- public InsertComments() {
- super(true);
- }
-
- public boolean visit(TypeDeclaration type) {
- Javadoc javadoc = type.getJavadoc();
- if( !isGenerated(javadoc)){
- Javadoc srcJavaDoc = getTypeJavaDoc(sourceAst,type);
- Javadoc newJavadoc = (Javadoc) ASTNode.copySubtree(targetAst.getAST(), srcJavaDoc);
- type.setJavadoc(newJavadoc);
- }
- return true;
- }
-
-
- public boolean visit(MethodDeclaration node) {
- Javadoc javadoc = node.getJavadoc();
- if( !isGenerated(javadoc) ){
- Javadoc srcJavaDoc = getMethodJavaDoc(sourceAst,node);
- Javadoc newJavadoc = (Javadoc) ASTNode.copySubtree(targetAst.getAST(), srcJavaDoc);
- node.setJavadoc(newJavadoc);
- }
- return true;
- }
-
-
- }
-
- targetAst.accept(new InsertComments());
-
-// ASTRewrite rewriter = ASTRewrite.create(targetAst.getAST());
-// rewriter.
- TextEdit edit = targetAst.rewrite(document, JavaCore.getOptions());
- try {
- edit.apply(document);
- } catch (Exception e) {
- e.printStackTrace();
- }
- return document.get();
-
- }
-
- /**
- * @param javadoc
- * @return
- */
- private boolean isGenerated(Javadoc javadoc) {
- if( javadoc == null)
- return false;
- Iterator tags = javadoc.tags().iterator();
- while (tags.hasNext()) {
- TagElement tag = (TagElement) tags.next();
- if( tag.getTagName() != null && tag.getTagName().equals("@generated") )
- return true;
- }
- return false;
- }
- private Javadoc getTypeJavaDoc(CompilationUnit cu, TypeDeclaration decl) {
-
- class TypeFinder extends ASTVisitor {
- String name;
- TypeDeclaration found = null;
-
- TypeFinder(String searchName,boolean visitDocTags)
- {
- super(visitDocTags);
- name = searchName;
- }
-
- public TypeDeclaration getType()
- {
- return found;
- }
-
- public boolean visit(TypeDeclaration type) {
- if(found == null)
- {
- if( name.equals( type.getName().getFullyQualifiedName() )){
- found = type;
- }
- }
- return true;
- }
-
- public boolean visit(MethodDeclaration node) {
- return true;
- }
- }
-
- TypeFinder finder = new TypeFinder(decl.getName().getFullyQualifiedName(),true);
- cu.accept(finder);
- TypeDeclaration declaration = finder.getType();
- return (declaration == null ? null : declaration.getJavadoc());
- }
- private Javadoc getMethodJavaDoc(CompilationUnit cu, MethodDeclaration decl) {
-
- String srcFakeSignature = this.makeSignature(decl);
- class MethodFinder extends ASTVisitor {
- String name;
- MethodDeclaration found = null;
-
- MethodFinder(String searchName,boolean visitDocTags)
- {
- super(visitDocTags);
- name = searchName;
- }
-
- public MethodDeclaration getMethod()
- {
- return found;
- }
-
- public boolean visit(TypeDeclaration type) {
-
- return true;
- }
-
- public boolean visit(MethodDeclaration node) {
- if(found == null)
- {
- String signature = makeSignature(node);
- if( name.equals(signature)){
- found = node;
- }
- }
- return true;
- }
- }
-
- MethodFinder finder = new MethodFinder(srcFakeSignature,true);
- cu.accept(finder);
- MethodDeclaration declaration = finder.getMethod();
- return (declaration == null ? null : declaration.getJavadoc());
- }
-
- /**
- * @param decl
- * @return
- */
- private String makeSignature(MethodDeclaration decl) {
-
- String signature = ""+decl.getReturnType2();
- signature += decl.getName().getFullyQualifiedName();
- Iterator params = decl.parameters().iterator();
- while (params.hasNext()) {
- SingleVariableDeclaration var = (SingleVariableDeclaration) params.next();
- signature += "_"+var.getType();
-
- }
- return signature;
- }
- /**
- * Creates the new type using the entered field values.
- *
- * @param monitor a progress monitor to report progress.
- */
- public void createType() throws CoreException, InterruptedException {
- monitor = getMonitor();
-
- monitor.beginTask("Creating a new type", 10);
-
- ICompilationUnit createdWorkingCopy= null;
- try {
- IPackageFragmentRoot root= getPackageFragmentRoot(); // Current source folder
- IPackageFragment pack= root.createPackageFragment(this.packageName,true,monitor); // Package that contains the class
- monitor.worked(1);
-
- String clName= this.typeName;
-
- IType createdType;
- ImportsManager imports;
- int indent= 0;
-
-
-
- String lineDelimiter= null;
- lineDelimiter= System.getProperty("line.separator", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
-
- ICompilationUnit parentCU= pack.getCompilationUnit(clName + ".java");
- if(!parentCU.exists())
- parentCU= pack.createCompilationUnit(clName + ".java", "", false, new SubProgressMonitor(monitor, 2)); //$NON-NLS-1$ //$NON-NLS-2$
- String targetSource = parentCU.getSource();
-
- // create a working copy with a new owner
- createdWorkingCopy= parentCU.getWorkingCopy(null);
-
- // use the compiler template a first time to read the imports
- String content= CodeGeneration.getCompilationUnitContent(createdWorkingCopy, null, "", lineDelimiter); //$NON-NLS-1$
- if (content != null) {
- createdWorkingCopy.getBuffer().setContents(content);
- }
-
- imports= new ImportsManager(createdWorkingCopy);
- // add an import that will be removed again. Having this import solves 14661
- imports.addImport(JavaModelUtil.concatenateName(pack.getElementName(), this.typeName));
-
- String cuContent = content + lineDelimiter + typeComment + lineDelimiter + typeStub;
- createdWorkingCopy.getBuffer().setContents(cuContent);
- createdType= createdWorkingCopy.getType(clName);
-
- // add imports for superclass/interfaces, so types can be resolved correctly
- ICompilationUnit cu= createdType.getCompilationUnit();
- boolean needsSave= !cu.isWorkingCopy();
- imports.create(needsSave, new SubProgressMonitor(monitor, 1));
-
- JavaModelUtil.reconcile(cu);
-
- createTypeMembers(createdType, imports, new SubProgressMonitor(monitor, 1));
-
- // add imports
- imports.create(needsSave, new SubProgressMonitor(monitor, 1));
-
- if (removeUnused(cu, imports)) {
- imports.create(needsSave, null);
- }
-
- JavaModelUtil.reconcile(cu);
-
- ISourceRange range= createdType.getSourceRange();
-
- IBuffer buf= cu.getBuffer();
- String originalContent= buf.getText(range.getOffset(), range.getLength());
-
- String formattedContent= CodeFormatterUtil.format(CodeFormatter.K_CLASS_BODY_DECLARATIONS, originalContent, indent, null, lineDelimiter, pack.getJavaProject());
- buf.replace(range.getOffset(), range.getLength(), formattedContent);
- cu.getBuffer().setContents(buf.getContents());
- String merged = merge(cu.getBuffer().getContents(),targetSource);
- cu.getBuffer().setContents(merged);
- cu.commitWorkingCopy(false, new SubProgressMonitor(monitor, 1));
-
- fCreatedType = (IType) createdType.getPrimaryElement();
-
- } finally {
- if (createdWorkingCopy != null) {
- createdWorkingCopy.discardWorkingCopy();
- }
- monitor.done();
- }
- }
-
- /**
- * @param createdType
- * @param imports
- * @param monitor2
- */
- private void createTypeMembers(IType createdType, ImportsManager imports, SubProgressMonitor monitor2) throws JavaModelException {
- if( fields != null && fields.length() > 0 )
- createdType.createField(fields,null, false, this.getMonitor());
- if( methodStub != null && methodStub.length() > 0 )
- createdType.createMethod(methodStub, null, false, this.getMonitor());
- }
-
- /**
- * @return
- */
- private IPackageFragmentRoot getPackageFragmentRoot() {
- return packageFragmentRoot;
- }
-
- private boolean removeUnused(ICompilationUnit cu, ImportsManager imports) {
- ASTParser parser= ASTParser.newParser(AST.JLS3);
- parser.setSource(cu);
- parser.setResolveBindings(true);
- CompilationUnit root= (CompilationUnit) parser.createAST(null);
- IProblem[] problems= root.getProblems();
- boolean importRemoved= false;
- for (int i= 0; i < problems.length; i++) {
- if (problems[i].getID() == IProblem.UnusedImport) {
- String imp= problems[i].getArguments()[0];
- imports.removeImport(imp);
- importRemoved=true;
- }
- }
- return importRemoved;
- }
-
- /**
- * @return Returns the monitor.
- */
- public IProgressMonitor getMonitor() {
- if (monitor == null) {
- monitor= new NullProgressMonitor();
- }
- return monitor;
- }
- /**
- * @param monitor The monitor to set.
- */
- public void setMonitor(IProgressMonitor monitor) {
- this.monitor = monitor;
- }
-
- public static class ImportsManager {
-
- private ImportsStructure fImportsStructure;
- private HashSet fAddedTypes;
-
- /* package */ ImportsManager(ICompilationUnit createdWorkingCopy) throws CoreException {
- IPreferenceStore store= PreferenceConstants.getPreferenceStore();
- String[] prefOrder= JavaPreferencesSettings.getImportOrderPreference(createdWorkingCopy.getPrimaryElement().getJavaProject());
- int threshold= JavaPreferencesSettings.getImportNumberThreshold(createdWorkingCopy.getPrimaryElement().getJavaProject());
- fAddedTypes= new HashSet();
-
- fImportsStructure= new ImportsStructure(createdWorkingCopy, prefOrder, threshold, true);
- }
-
- /* package */ ImportsStructure getImportsStructure() {
- return fImportsStructure;
- }
-
- /**
- * Adds a new import declaration that is sorted in the existing imports.
- * If an import already exists or the import would conflict with another import
- * of an other type with the same simple name the import is not added.
- *
- * @param qualifiedTypeName The fully qualified name of the type to import
- * (dot separated)
- * @return Returns the simple type name that can be used in the code or the
- * fully qualified type name if an import conflict prevented the import
- */
- public String addImport(String qualifiedTypeName) {
- fAddedTypes.add(qualifiedTypeName);
- return fImportsStructure.addImport(qualifiedTypeName);
- }
-
- /* package */ void create(boolean needsSave, SubProgressMonitor monitor) throws CoreException {
- fImportsStructure.create(needsSave, monitor);
- }
-
- /* package */ void removeImport(String qualifiedName) {
- if (fAddedTypes.contains(qualifiedName)) {
- fImportsStructure.removeImport(qualifiedName);
- }
- }
-
- }
-
- /**
- * @return Returns the fCreatedType.
- */
- public IType getCreatedType() {
- return fCreatedType;
- }
- /**
- * @param createdType The fCreatedType to set.
- */
- public void setCreatedType(IType createdType) {
- fCreatedType = createdType;
- }
- /**
- * @return Returns the methodStub.
- */
- public String getMethodStub() {
- return methodStub;
- }
- /**
- * @param methodStub The methodStub to set.
- */
- public void setMethodStub(String methodStub) {
- this.methodStub = methodStub;
- }
- /**
- * @return Returns the packageName.
- */
- public String getPackageName() {
- return packageName;
- }
- /**
- * @param packageName The packageName to set.
- */
- public void setPackageName(String packageName) {
- this.packageName = packageName;
- }
- /**
- * @return Returns the typeComment.
- */
- public String getTypeComment() {
- return typeComment;
- }
- /**
- * @param typeComment The typeComment to set.
- */
- public void setTypeComment(String typeComment) {
- this.typeComment = typeComment;
- }
- /**
- * @return Returns the typeName.
- */
- public String getTypeName() {
- return typeName;
- }
- /**
- * @param typeName The typeName to set.
- */
- public void setTypeName(String typeName) {
- this.typeName = typeName;
- }
- /**
- * @return Returns the typeStub.
- */
- public String getTypeStub() {
- return typeStub;
- }
- /**
- * @param typeStub The typeStub to set.
- */
- public void setTypeStub(String typeStub) {
- this.typeStub = typeStub;
- }
- /**
- * @param packageFragmentRoot The packageFragmentRoot to set.
- */
- public void setPackageFragmentRoot(IPackageFragmentRoot packageFragmentRoot) {
- this.packageFragmentRoot = packageFragmentRoot;
- }
- /**
- * @return Returns the fields.
- */
- public String getFields() {
- return fields;
- }
- /**
- * @param fields The fields to set.
- */
- public void setFields(String fields) {
- this.fields = fields;
- }
- /**
- * @return Returns the configurationElement.
- */
- public IConfigurationElement getConfigurationElement() {
- return configurationElement;
- }
- /**
- * @param configurationElement The configurationElement to set.
- */
- public void setConfigurationElement(
- IConfigurationElement configurationElement) {
- this.configurationElement = configurationElement;
- }
- /**
- * @return Returns the IEnterpriseBeanDelegate.
- */
- public IEnterpriseBean getEnterpriseBeanDelegate() {
- return enterpriseBeanDelegate;
- }
- /**
- * @param IEnterpriseBeanDelegate The IEnterpriseBeanDelegate to set.
- */
- public void setEnterpriseBeanDelegate(IEnterpriseBean delegate) {
- this.enterpriseBeanDelegate = delegate;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/DefaultClasspathProvider.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/DefaultClasspathProvider.java
deleted file mode 100644
index 1fa6812..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/DefaultClasspathProvider.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-
-
-package org.eclipse.jst.j2ee.ejb.annotations.internal.emitter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author naci
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-public class DefaultClasspathProvider implements IEmitterClasspathProvider {
-
- protected ArrayList list = null;
- public DefaultClasspathProvider() {
- super();
- list = new ArrayList();
- }
-
-
- public List getClasspathItems() {
- list.clear();
- list.add("org.eclipse.emf.ecore");
- list.add("org.eclipse.emf.ecore.xmi");
- list.add("org.eclipse.emf.common");
- list.add("org.eclipse.jst.j2ee.core");
- list.add("org.eclipse.jst.j2ee.ejb.annotation.model");
- list.add("org.eclipse.jst.j2ee.ejb.annotations.emitter");
- return list;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/DefaultEjbIntrospector.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/DefaultEjbIntrospector.java
deleted file mode 100644
index 0f699f5..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/DefaultEjbIntrospector.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.jst.j2ee.ejb.annotations.internal.emitter;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-
-
-/**
- * @author naci
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-public abstract class DefaultEjbIntrospector implements IEjbIntrospector {
-
-
-
- public abstract EnterpriseBean getEnterpriseBean();
-
- protected boolean isEntityBean(ICompilationUnit unit) {
-
- try {
- IType type = unit.findPrimaryType();
- String[] inter = type.getSuperInterfaceNames();
- for (int i = 0; i < inter.length; i++) {
- if (inter[i].endsWith("EntityBean")) {
- return true;
- }
- }
- } catch (JavaModelException e) {
- }
- return false;
- }
-
- protected boolean isMDBBean(ICompilationUnit unit) {
-
- try {
- IType type = unit.findPrimaryType();
- String[] inter = type.getSuperInterfaceNames();
- for (int i = 0; i < inter.length; i++) {
- if (inter[i].endsWith("MessageDrivenBean")) {
- return true;
- }
- }
- } catch (JavaModelException e) {
- }
- return false;
- }
-
- /**
- * @return
- */
- protected boolean isSessionBean(ICompilationUnit unit) {
-
- try {
- IType type = unit.findPrimaryType();
- String[] inter = type.getSuperInterfaceNames();
- for (int i = 0; i < inter.length; i++) {
- if (inter[i].endsWith("SessionBean")) {
- return true;
- }
- }
- } catch (JavaModelException e) {
- }
- return false;
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/EjbEmitter.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/EjbEmitter.java
deleted file mode 100644
index f5b4c1d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/EjbEmitter.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.jst.j2ee.ejb.annotations.internal.emitter;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.codegen.jet.JETException;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.IEnterpriseBean;
-import org.eclipse.jst.j2ee.internal.project.WTPJETEmitter;
-
-public abstract class EjbEmitter {
- public static final String CLASSPATHPROVIDER = "classpathProvider";
- public static final String JAVACLASSPATHVARIABLEPREFIX = "WTPEJBEMITTER";
- public static final String EJBEMITTERPROJECT = ".WtpEjbEmitter";
- protected IConfigurationElement emitterConfig;
- protected IEmitterClasspathProvider classpathProvider;
- protected String base;
- protected IProgressMonitor monitor;
-
- public EjbEmitter(IConfigurationElement emitterConfig) throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException {
- this.emitterConfig = emitterConfig;
- String pluginDescriptor = emitterConfig.getDeclaringExtension().getNamespace();
-
- org.osgi.framework.Bundle bundle = Platform.getBundle(pluginDescriptor);
- Class c = bundle.loadClass(emitterConfig.getAttribute(CLASSPATHPROVIDER));
- classpathProvider = (IEmitterClasspathProvider) c.newInstance();
- base = bundle.getEntry("/").toString();
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(EJBEMITTERPROJECT);
- IProgressMonitor monitor = new NullProgressMonitor();
- project.delete(true, true, monitor);
- }
-
- public abstract String emitTypeComment(IEnterpriseBean enterpriseBean) throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException;
-
- public abstract String emitTypeStub(IEnterpriseBean enterpriseBean) throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException;
-
- public abstract String emitInterfaceMethods(IEnterpriseBean enterpriseBean) throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException;
-
- public abstract String emitFields(IEnterpriseBean enterpriseBean) throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException;
-
- /**
- * @param uri
- * @return
- * @throws JETException
- */
- protected WTPJETEmitter createJetEmitter(String uri) throws JETException {
- WTPJETEmitter emitter = new WTPJETEmitter(uri, this.getClass().getClassLoader());
- emitter.setProjectName(EJBEMITTERPROJECT);
- emitter.setIntelligentLinkingEnabled(true);
- Iterator iterator = classpathProvider.getClasspathItems().iterator();
- int count = 0;
- while (iterator.hasNext()) {
- String cpItem = (String) iterator.next();
- emitter.addVariable(JAVACLASSPATHVARIABLEPREFIX + count++, cpItem);
- }
- return emitter;
- }
-
- public String generate(String templatesBase, String template, IEnterpriseBean enterpriseBean) throws CoreException {
- String uri = base + templatesBase + template;
- String result = "";
- IProgressMonitor aMonitor = this.getMonitor();
- WTPJETEmitter emitter = createJetEmitter(uri);
- result = emitter.generate(aMonitor, new Object[] { enterpriseBean });
- return result;
- }
-
- /**
- * @return Returns the monitor.
- */
- public IProgressMonitor getMonitor() {
- if (monitor == null) {
- monitor = new IProgressMonitor() {
- private boolean cancelled = false;
-
- public void beginTask(String name, int totalWork) {
- System.out.println(this.getClass() + " Progress (" + totalWork + "): " + name);
- }
-
- public void done() {
- }
-
- public void internalWorked(double work) {
- }
-
- public boolean isCanceled() {
- return cancelled;
- }
-
- public void setCanceled(boolean value) {
- cancelled = value;
- }
-
- public void setTaskName(String name) {
- System.out.println(this.getClass() + " Progress Task(" + name + "): ");
- }
-
- public void subTask(String name) {
- System.out.println(this.getClass() + " Progress SubTask(" + name + "): ");
- }
-
- public void worked(int work) {
- }
- };
- }
- return monitor;
- }
-
- /**
- * @param monitor
- * The monitor to set.
- */
- public void setMonitor(IProgressMonitor monitor) {
- this.monitor = monitor;
- }
-
- public void deleteProject() throws CoreException {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(EJBEMITTERPROJECT);
- IProgressMonitor monitor = new NullProgressMonitor();
- project.delete(true, true, monitor);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/EjbEmitterPlugin.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/EjbEmitterPlugin.java
deleted file mode 100644
index c5ebb76..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/EjbEmitterPlugin.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.jst.j2ee.ejb.annotations.internal.emitter;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-
-public class EjbEmitterPlugin extends AbstractUIPlugin {
- //The shared instance.
- private static EjbEmitterPlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
-
- /**
- * The constructor.
- */
- public EjbEmitterPlugin() {
- super();
- plugin = this;
- }
-
- /**
- * This method is called upon plug-in activation
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- /**
- * This method is called when the plug-in is stopped
- */
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- plugin = null;
- resourceBundle = null;
- }
-
- /**
- * Returns the shared instance.
- */
- public static EjbEmitterPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the string from the plugin's resource bundle,
- * or 'key' if not found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = EjbEmitterPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null) ? bundle.getString(key) : key;
- } catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- try {
- if (resourceBundle == null)
- resourceBundle = ResourceBundle.getBundle("org.eclipse.jst.j2ee.ejb.annotations.internal.emitter.model.emitter.EjbEmitterPluginResources");
- } catch (MissingResourceException x) {
- resourceBundle = null;
- }
- return resourceBundle;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/EmitterUtilities.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/EmitterUtilities.java
deleted file mode 100644
index 61826dd..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/EmitterUtilities.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.jst.j2ee.ejb.annotations.internal.emitter;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-
-/**
- * @author naci
- */
-public class EmitterUtilities {
-
- public static void addAnnotationBuilderToProject(IConfigurationElement emitter,
- IProject targetProject) throws CoreException {
- String builderId = emitter.getAttribute("builderId");
- ProjectUtilities.addToBuildSpec(emitter.getNamespace()+ "." + builderId, targetProject);
-
- }
-
-
- public static IConfigurationElement findEmitter(String id)
- {
-
- IConfigurationElement configurationElement[] = getAnnotationExtensions();
- for (int i = 0; i < configurationElement.length; i++) {
- IConfigurationElement element = configurationElement[i];
- String emitterId = element.getAttribute("name");
- if("emitter".equals(element.getName()) && emitterId != null && emitterId.equals(id))
- return element;
- }
- return null;
- }
-
- public static IConfigurationElement[] getAnnotationExtensions()
- {
- IConfigurationElement[] configurationElements = Platform
- .getExtensionRegistry()
- .getConfigurationElementsFor(
- "org.eclipse.jst.j2ee.ejb.annotations.emitter.template");
- return configurationElements;
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/EntityEjbEmitter.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/EntityEjbEmitter.java
deleted file mode 100644
index 25e207b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/EntityEjbEmitter.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.jst.j2ee.ejb.annotations.internal.emitter;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.IEnterpriseBean;
-
-public class EntityEjbEmitter extends EjbEmitter {
- public static final String TYPE_COMMENT = "/typeComment.javajet";
- public static final String TYPE_STUB = "/typeStub.javajet";
- public static final String METHOD_STUBS = "/methodStubs.javajet";
- public static final String FIELDS = "/fields.javajet";
- public static final String TEMPLATESDIR = "entityTemplates";
- public EntityEjbEmitter(IConfigurationElement emitterConfig)
- throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException {
- super(emitterConfig);
- }
- public String emitTypeComment(IEnterpriseBean root)
- throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException {
- return generate(emitterConfig.getAttribute(TEMPLATESDIR), TYPE_COMMENT,
- root);
- }
- public String emitTypeStub(IEnterpriseBean root)
- throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException {
- return generate(emitterConfig.getAttribute(TEMPLATESDIR), TYPE_STUB,
- root);
- }
- public String emitInterfaceMethods(IEnterpriseBean root)
- throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException {
- return generate(emitterConfig.getAttribute(TEMPLATESDIR), METHOD_STUBS,
- root);
- }
- public String emitFields(IEnterpriseBean root) throws ClassNotFoundException,
- InstantiationException, IllegalAccessException, CoreException {
- return generate(emitterConfig.getAttribute(TEMPLATESDIR), FIELDS, root);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/IEjbIntrospector.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/IEjbIntrospector.java
deleted file mode 100644
index 4d2743f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/IEjbIntrospector.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.jst.j2ee.ejb.annotations.internal.emitter;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-
-
-
-public interface IEjbIntrospector {
-
- public abstract EnterpriseBean getEnterpriseBean();
- public abstract void setCompilationUnit(ICompilationUnit compilationUnit);
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/IEmitterClasspathProvider.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/IEmitterClasspathProvider.java
deleted file mode 100644
index d565a1d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/IEmitterClasspathProvider.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.jst.j2ee.ejb.annotations.internal.emitter;
-
-import java.util.List;
-
-/**
- * @author naci
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-public interface IEmitterClasspathProvider {
-
- List getClasspathItems();
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/MessageDrivenEjbEmitter.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/MessageDrivenEjbEmitter.java
deleted file mode 100644
index 7045f18..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/MessageDrivenEjbEmitter.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.jst.j2ee.ejb.annotations.internal.emitter;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.IEnterpriseBean;
-
-public class MessageDrivenEjbEmitter extends EjbEmitter {
- public static final String TYPE_COMMENT = "/typeComment.javajet";
- public static final String TYPE_STUB = "/typeStub.javajet";
- public static final String METHOD_STUBS = "/methodStubs.javajet";
- public static final String FIELDS = "/fields.javajet";
- public static final String TEMPLATESDIR = "messageTemplates";
- public MessageDrivenEjbEmitter(IConfigurationElement emitterConfig)
- throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException {
- super(emitterConfig);
- }
- public String emitTypeComment(IEnterpriseBean root)
- throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException {
- return generate(emitterConfig.getAttribute(TEMPLATESDIR), TYPE_COMMENT,
- root);
- }
- public String emitTypeStub(IEnterpriseBean root)
- throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException {
- return generate(emitterConfig.getAttribute(TEMPLATESDIR), TYPE_STUB,
- root);
- }
- public String emitInterfaceMethods(IEnterpriseBean root)
- throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException {
- return generate(emitterConfig.getAttribute(TEMPLATESDIR), METHOD_STUBS,
- root);
- }
- public String emitFields(IEnterpriseBean root) throws ClassNotFoundException,
- InstantiationException, IllegalAccessException, CoreException {
- return generate(emitterConfig.getAttribute(TEMPLATESDIR), FIELDS, root);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/SessionEjbEmitter.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/SessionEjbEmitter.java
deleted file mode 100644
index 41c24e4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/SessionEjbEmitter.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.jst.j2ee.ejb.annotations.internal.emitter;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.IEnterpriseBean;
-
-
-public class SessionEjbEmitter extends EjbEmitter {
- public static final String TYPE_COMMENT = "/typeComment.javajet";
- public static final String TYPE_STUB = "/typeStub.javajet";
- public static final String METHOD_STUBS = "/methodStubs.javajet";
- public static final String FIELDS = "/fields.javajet";
- public static final String TEMPLATESDIR = "sessionTemplates";
- public SessionEjbEmitter(IConfigurationElement emitterConfig)
- throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException {
- super(emitterConfig);
- }
- public String emitTypeComment(IEnterpriseBean root)
- throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException {
- return generate(emitterConfig.getAttribute(TEMPLATESDIR), TYPE_COMMENT,
- root);
- }
- public String emitTypeStub(IEnterpriseBean root)
- throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException {
- return generate(emitterConfig.getAttribute(TEMPLATESDIR), TYPE_STUB,
- root);
- }
- public String emitInterfaceMethods(IEnterpriseBean root)
- throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException {
- return generate(emitterConfig.getAttribute(TEMPLATESDIR), METHOD_STUBS,
- root);
- }
- public String emitFields(IEnterpriseBean root) throws ClassNotFoundException,
- InstantiationException, IllegalAccessException, CoreException {
- return generate(emitterConfig.getAttribute(TEMPLATESDIR), FIELDS, root);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/.classpath b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/.classpath
deleted file mode 100644
index 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 96d041c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-temp.folder
-build.xml
-ejbAnnotationsUi.jar
-@dot
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 9c71063..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,29 +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: 0.7.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
-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/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/plugin.properties b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/plugin.properties
deleted file mode 100644
index 137a092..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/plugin.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-ejb.category_ui_=EJB
-ejb.createbean_ui_= Enterprise JavaBean
-new.ejb.description_ui_=Create Enterprise JavaBean
-j2ee_annotations=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 0772a9c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/plugin.xml
+++ /dev/null
@@ -1,63 +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 PREFERNCES -->
-<!--================================-->
-
- <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>
-
-</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/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 9e39505..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,153 +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.ResourceBundle;
-
-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;
-
-public class AnnotationPreferencePage extends PreferencePage implements
- IWorkbenchPreferencePage, SelectionListener {
-
- DialogPanel panel;
-
- public AnnotationPreferencePage() {
- 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);
- 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(bundle.getString("label_set_j2ee_annotation_preference"));
-
- panel.preferences = new Control[1];
- panel.preferences[0] = panel
- .createLabeledCombo(
- 1,
- false,
- true,
- bundle.getString("label_active_annotation_provider"),
- bundle.getString("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();
- }
-
-}
\ 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/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 d1dbe10..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,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.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.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;
-
-
- /**
- * @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();
- sessionEjbWizard.init(workbench, selection);
- sessionEjbWizard.addPages();
- messageDrivenEjbWizard.init(workbench, selection);
- messageDrivenEjbWizard.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;
- }
- }
- 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));
- }
- 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();
- }
-
-}
\ 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 4e9c75a..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.ui.IWorkbench;
-import org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-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;
-
- private static final String PAGE_TWO = "pageTwo"; //$NON-NLS-1$
- private static final String PAGE_THREE = "pageThree"; //$NON-NLS-1$
- private static final String PAGE_FOUR = "pageFour"; //$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_TWO,
- IEJBAnnotationConstants.NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC,
- IEJBAnnotationConstants.ADD_EJB_WIZARD_PAGE_TITLE, IModuleConstants.JST_EJB_MODULE);
- newJavaClassWizardPage.setInfopopID(IEJBUIContextIds.ANNOTATION_EJB_PAGE_ADD_ADD_WIZARD_2);
- addPage(newJavaClassWizardPage);
-
- addMessageDrivenBeanWizardPage = new AddMessageDrivenBeanWizardPage(getDataModel(), PAGE_THREE);
- addMessageDrivenBeanWizardPage.setInfopopID(IEJBUIContextIds.ANNOTATION_EJB_PAGE_ADD_ADD_WIZARD_1);
- addPage(addMessageDrivenBeanWizardPage);
- addMessageDrivenBeanWizardPage.setPageComplete(false);
-
- newEjbClassOptionsWizardPage = new NewEjbClassOptionsWizardPage(getDataModel(), PAGE_FOUR,
- 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 false;
- }
-
- 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 c7b1205..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.ui.IWorkbench;
-import org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-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;
-
- private static final String PAGE_TWO = "pageTwo"; //$NON-NLS-1$
- private static final String PAGE_THREE = "pageThree"; //$NON-NLS-1$
- private static final String PAGE_FOUR = "pageFour"; //$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_TWO,
- IEJBAnnotationConstants.NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC,
- IEJBAnnotationConstants.ADD_EJB_WIZARD_PAGE_TITLE,
- IModuleConstants.JST_EJB_MODULE);
- newJavaClassWizardPage.setInfopopID(IEJBUIContextIds.ANNOTATION_EJB_PAGE_ADD_ADD_WIZARD_2);
- addPage(newJavaClassWizardPage);
-
-
- addSessionBeanWizardPage = new AddSessionBeanWizardPage(getDataModel(), PAGE_THREE);
- addSessionBeanWizardPage.setInfopopID(IEJBUIContextIds.ANNOTATION_EJB_PAGE_ADD_ADD_WIZARD_1);
- addPage(addSessionBeanWizardPage);
- addSessionBeanWizardPage.setPageComplete(false);
-
- newEjbClassOptionsWizardPage = new NewEjbClassOptionsWizardPage(
- getDataModel(),
- PAGE_FOUR,
- 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 false;
- }
-
- 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 21219f1..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,238 +0,0 @@
-/**
- *
- */
-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.Combo;
-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 Combo annotationProvider;
-
- 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$
-
- messageDrivenType = new Button(ejbTypeGroup, SWT.RADIO);
- messageDrivenType.setText("MessageDrivenBean"); //$NON-NLS-1$
-
- sessionType.setSelection(true);
- messageDrivenType.setSelection(false);
-
- sessionType.addSelectionListener(new SelectionListener() {
-
- public void widgetSelected(SelectionEvent e) {
- if (sessionType.getSelection()) {
- ChooseEjbTypeWizardPage.this.model.setProperty(IEnterpriseBeanClassDataModelProperties.EJB_TYPE, "SessionBean");
- }
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- this.widgetSelected(e);
- }
- });
-
- messageDrivenType.addSelectionListener(new SelectionListener() {
-
- public void widgetSelected(SelectionEvent e) {
- if (messageDrivenType.getSelection()) {
- ChooseEjbTypeWizardPage.this.model.setProperty(IEnterpriseBeanClassDataModelProperties.EJB_TYPE, "MessageDrivenBean");
- }
- }
-
- 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[] provider = AnnotationUtilities.getProviderNames();
- final String preferred = AnnotationPreferenceStore.getProperty(AnnotationPreferenceStore.ANNOTATIONPROVIDER);
- ChooseEjbTypeWizardPage.this.model.setProperty(IEnterpriseBeanClassDataModelProperties.ANNOTATIONPROVIDER, preferred);
- boolean selected = false;
- String providerS = null;
- 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, providerS);
-
- annotationProvider.addSelectionListener(new SelectionListener() {
-
- public void widgetSelected(SelectionEvent e) {
- validateProvider();
-
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- this.widgetSelected(e);
- }
- });
-
- }
-
- public String getEJBType() {
- return model.getStringProperty(IEnterpriseBeanClassDataModelProperties.EJB_TYPE);
- }
-
- public boolean isPageComplete() {
- String provider = annotationProvider.getText();
- 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.annotation.ui.preferences");
- 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 = annotationProvider.getText();
- 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 c5da70e..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,19 +0,0 @@
-/*
- * Created on Feb 6, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.ejb.annotation.ui.internal.wizards;
-
-/**
- * @author naci
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-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 4a845a9..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,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.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$
-
-
-}
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 9d76bfa..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,23 +0,0 @@
-/**
- *
- */
-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 9e72cf6..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,49 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.jst.j2ee.ejb.annotation.ui.internal.wizards;
-
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.ejb.ui.internal.wizard.EJBComponentCreationWizard;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.ejb.datamodel.properties.IEjbComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.ejb.archiveoperations.EjbComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.wizard.NewJavaClassWizardPage;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IComponentCreationDataModelProperties;
-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);
- this.setHasNewModuleButton(true);
- }
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = super.createTopLevelComposite(parent);
- return composite;
- }
-
- protected void createNewComponent() {
- IDataModel aModel = DataModelFactory.createDataModel(new EjbComponentCreationDataModelProvider());
- aModel.setBooleanProperty(IJ2EEComponentCreationDataModelProperties.ADD_TO_EAR, false);
- aModel.setBooleanProperty(IEjbComponentCreationDataModelProperties.CREATE_CLIENT, false);
- EJBComponentCreationWizard componentCreationWizard = new EJBComponentCreationWizard(aModel);
-
- WizardDialog dialog = new WizardDialog(getShell(), componentCreationWizard);
- if (Window.OK == dialog.open()) {
- String newProjectName = aModel.getStringProperty( IComponentCreationDataModelProperties.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 0d7f679..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,91 +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.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-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.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++) {
- StructureEdit core = null;
- try {
- core = StructureEdit.getStructureEditForRead(projects[i]);
- if(core != null) {
- WorkbenchComponent[] components = core.findComponentsByType(EJBArtifactEdit.TYPE_ID);
- if (components != null && components.length > 0) {
- project = projects[i];
- break;
- }
- }
- } finally {
- if(core != null)
- core.dispose();
- }
- }
- }
- 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 f2716e0..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-temp.folder
-build.xml
-xdocletAnnotation.jar
-@dot
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 ea78e94..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,40 +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: 0.7.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.ui.externaltools,
- org.eclipse.jdt.debug.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 ad32868..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-bin.includes = plugin.xml,\
- .,\
- ejb-merge.xml,\
- templates/,\
- META-INF/,\
- about.html,\
- plugin.properties
-src.includes = build.properties
-source.. = src/
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/ejb-merge.xml b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/ejb-merge.xml
deleted file mode 100644
index e0bff6e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/ejb-merge.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<merge:options
- indent=" "
- braceStyle="matching"
- block="\s*@\s*generated\s*NOT\s*\n"
- xmlns:merge="http://www.eclipse.org/org/eclipse/emf/codegen/jmerge/Options">
-
-
- <merge:dictionaryPattern
- name="generatedMember"
- select="Member/getComment"
- match="\s*@\s*(gen)erated\s*\n"/>
-
-
- <merge:dictionaryPattern
- name="modifiedMember"
- select="Member/getComment"
- match="\s*@\s*(modify)\s*\n"/>
-
-
-
- <merge:pull
- targetMarkup="^gen$"
- sourceGet="Method/getBody"
- sourceTransfer="(\s*//\s*begin-user-code.*?//\s*end-user-code\s*)\n"
- targetPut="Method/setBody"/>
-
- <!-- copy comments except between the begin-user-doc
- and end-user-doc tags -->
- <merge:pull
- sourceMarkup="^gen$"
- sourceGet="Member/getComment"
- sourceTransfer="(\s*<!--\s*begin-user-doc.*?end-user-doc\s*-->\s*)"
- targetMarkup="^gen$"
- targetPut="Member/setComment"/>
-
-
-
- <!-- Requests generator to replace the complete comment -->
- <merge:pull
- sourceMarkup="^gen$"
- sourceGet="Member/getComment"
- targetMarkup="^modify$"
- targetPut="Member/setComment"/>
-
- <merge:pull
- sourceGet="Member/getFlags"
- targetMarkup="^gen$"
- targetPut="Member/setFlags"/>
-
- <merge:pull
- sourceGet="Initializer/getBody"
- targetMarkup="^gen$"
- targetPut="Initializer/setBody"/>
-
- <merge:pull
- sourceGet="Type/getSuperclass"
- targetMarkup="^gen$"
- targetPut="Type/setSuperclass"/>
-
- <merge:pull
- sourceGet="Type/getSuperInterfaces"
- sourceTransfer="(\s*@\s*extends|\s*@\s*implements)(.*?)\n"
- targetMarkup="^gen$"
- targetPut="Type/addSuperInterface"/>
-
- <merge:pull
- sourceGet="Field/getType"
- targetMarkup="^gen$"
- targetPut="Field/setType"/>
- <merge:pull
- sourceGet="Field/getInitializer"
- targetMarkup="^gen$"
- targetPut="Field/setInitializer"/>
-
- <merge:pull
- sourceGet="Method/getReturnType"
- targetMarkup="^gen$"
- targetPut="Method/setReturnType"/>
- <merge:pull
- sourceGet="Method/getExceptions"
- targetMarkup="^gen$"
- targetPut="Method/addException"/>
-
-
-
- <!-- if there are generated code fragments that are not in the
- new generated code remove them. Usefule when renaming methods/fields -->
- <merge:sweep markup="^gen$" select="Member"/>
- <merge:sweep markup="^gen$" select="Type"/>
-
-</merge:options>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/plugin.properties b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/plugin.properties
deleted file mode 100644
index e61f1a7..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-name_xdoclet=XDoclet
-name_ejbdoclet=ejbdoclet
-name_webdoclet=webdoclet
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 8276b01..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/plugin.xml
+++ /dev/null
@@ -1,582 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <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"
- category="org.eclipse.jst.j2ee.ejb.annotation.ui.preferences"
- 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>
-
- <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>
-
-
- <!-- ================================================ -->
- <!-- 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/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 e15055c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletAnnotationPlugin.java
+++ /dev/null
@@ -1,92 +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.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-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);
- }
-
-}
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 46b1c96..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletAntProjectBuilder.java
+++ /dev/null
@@ -1,160 +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.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-
-public abstract class XDocletAntProjectBuilder {
-
- protected URL templateUrl;
-
- public static class Factory {
-
- public static XDocletAntProjectBuilder newInstance(IResource resource) {
- IVirtualResource[] vResources = ComponentCore.createResources(resource);
- if( vResources.length == 0)
- return null;
- String moduleType = vResources[0].getComponent().getComponentTypeId();
- if (moduleType.equals(IModuleConstants.JST_EJB_MODULE))
- return new XDocletEjbAntProjectBuilder();
- else if (moduleType.equals(IModuleConstants.JST_WEB_MODULE))
- return new XDocletWebAntProjectBuilder();
- return null;
- }
-
- }
-
- public XDocletAntProjectBuilder() {
- super();
- }
-
- 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) {
- IJavaProject javaProject = JavaCore.create(beanClass.getProject());
- ICompilationUnit compilationUnit = JavaCore
- .createCompilationUnitFrom((IFile) beanClass);
- try {
- IPackageFragmentRoot packageFragmentRoot = this
- .getPackageFragmentRoot(compilationUnit);
- String beanPath = constructAnnotatedClassList(packageFragmentRoot,
- beanClass);
-
- Properties properties = createAntBuildProperties(beanClass,
- javaProject, packageFragmentRoot, beanPath);
-
- 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);
- }
- }
-
- 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) {
- 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();
- }
-
-}
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 13bda6c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletBuilder.java
+++ /dev/null
@@ -1,351 +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 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) {
- if (!XDocletPreferenceStore.isPropertyActive(XDocletPreferenceStore.XDOCLETBUILDERACTIVE)) {
- return;
- }
- 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++) {
- add(localMonitor, allProjects[i], validateEditContext);
- localMonitor.worked(1);
- }
- localMonitor.done();
- }
-
- private 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.isPropertyActive(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;
- }
- 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 3ffc4a9..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletEjbAntProjectBuilder.java
+++ /dev/null
@@ -1,295 +0,0 @@
-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.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.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;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-
-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("@jboss@", addJbossTask()); //$NON-NLS-1$
- templates.put("@jonas@", addJonasTask()); //$NON-NLS-1$
- templates.put("@weblogic@", addWeblogicTask()); //$NON-NLS-1$
- templates.put("@websphere@", addWebSphereTask()); //$NON-NLS-1$
- templates.put("@deploymentdescriptor@", addDeploymentDescriptorTask()); //$NON-NLS-1$
- return templates;
- }
-
- /**
- * @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", XDocletPreferenceStore.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;
- }
- IProject proj = StructureEdit.getContainingProject(ejbModule);
- ejbEdit = EJBArtifactEdit.getEJBArtifactEditForRead(proj);
- int j2eeVersion = 0;
- if (ejbEdit != null) {
- j2eeVersion = ejbEdit.getJ2EEVersion();
- }
-
- String ejbLevel = J2EEVersionConstants.VERSION_2_0_TEXT;
- if (j2eeVersion == J2EEVersionConstants.J2EE_1_3_ID)
- ejbLevel = J2EEVersionConstants.VERSION_2_0_TEXT;
- else if (j2eeVersion == J2EEVersionConstants.J2EE_1_4_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());
- if( clientEjbJarComp.getComponentType().getComponentTypeId().equals(IModuleConstants.JST_UTILITY_MODULE)){
- 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 {
- 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);
- }
- }
-
- private String addWeblogicTask() {
- if (!XDocletPreferenceStore.isPropertyActive(XDocletPreferenceStore.EJB_WEBLOGIC))
- return ""; //$NON-NLS-1$
- String version = XDocletPreferenceStore.getProperty(XDocletPreferenceStore.EJB_WEBLOGIC + "_VERSION");
- String createtables = "False"; // < 8.1 True | False
- if( "8.1".equals(version))
- createtables = "Disabled"; // >= 8.1 Disabled | ...
- return "<weblogic version=\"" + version + "\"" + " xmlencoding=\"UTF-8\"" + " destdir=\"\\${ejb.dd.dir}\"" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
- + " createtables=\""+createtables+"\""+" validatexml=\"false\"" + " datasource=\"\\${data.source.name}\"" + " mergedir=\"\\${ejb.dd.dir}\"" + " persistence=\"weblogic\" />"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-
- }
-
- private String addJbossTask() {
- if (!XDocletPreferenceStore.isPropertyActive(XDocletPreferenceStore.EJB_JBOSS))
- return ""; //$NON-NLS-1$
- return "<jboss version=\""
- + XDocletPreferenceStore.getProperty(XDocletPreferenceStore.EJB_JBOSS + "_VERSION") + "\""
- + " xmlencoding=\"UTF-8\""
- + " destdir=\"\\${ejb.dd.dir}\""
- + " validatexml=\"false\" />"; //$NON-NLS-1$ //$NON-NLS-2$
-
- }
-
- private String addJonasTask() {
- if (!XDocletPreferenceStore.isPropertyActive(XDocletPreferenceStore.EJB_JONAS))
- return ""; //$NON-NLS-1$
- return "<jonas version=\"" + XDocletPreferenceStore.getProperty(XDocletPreferenceStore.EJB_JONAS + "_VERSION") + "\"" + " xmlencoding=\"UTF-8\"" + " destdir=\"\\${ejb.dd.dir}\"" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
- + " validatexml=\"false\"" + " mergedir=\"\\${ejb.dd.dir}\" />"; //$NON-NLS-1$ //$NON-NLS-2$
-
- }
-
- private String addDeploymentDescriptorTask() {
- if (clientProject == null)
- return "<deploymentdescriptor destdir=\"\\${ejb.dd.dir}\" "+
- "displayname=\"\\${ejb.dd.displayname}\" "+
- "description=\"\\${ejb.dd.description}\" "+
- "validatexml=\"false\" "+
- "mergedir=\"\\${ejb.dd.dir}\" />";
- else
- return "<deploymentdescriptor destdir=\"\\${ejb.dd.dir}\" "+
- "displayname=\"\\${ejb.dd.displayname}\" "+
- "description=\"\\${ejb.dd.description}\" "+
- "validatexml=\"false\" "+
- "clientjar=\"\\${ejb.dd.clientjar}\" "+
- "mergedir=\"\\${ejb.dd.dir}\" />";
-
- }
-
-
- private String addWebSphereTask() {
- if (!XDocletPreferenceStore.isPropertyActive(XDocletPreferenceStore.EJB_WEBSPHERE))
- return ""; //$NON-NLS-1$
- return "<webSphere destdir=\"\\${ejb.dd.dir}\"/>"; //$NON-NLS-1$
- }
-
- 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/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 8fccb1a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletPreferenceStore.java
+++ /dev/null
@@ -1,129 +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 org.eclipse.jface.preference.IPreferenceStore;
-
-
-
-
-public class XDocletPreferenceStore {
-
-
-
- private static IPreferenceStore preferenceStore = null;
- public static final String XDOCLETBUILDERACTIVE = "XDOCLETBUILDERACTIVE";
- public static final String XDOCLETFORCE = "XDOCLETFORCE";
- public static final String XDOCLETHOME = "XDOCLETHOME";
- public static final String XDOCLETVERSION = "XDOCLETVERSION";
-
- public static final String EJB_JBOSS = "EJB_JBOSS";
- public static final String EJB_JONAS = "EJB_JONAS";
- public static final String EJB_WEBSPHERE = "EJB_WEBSPHERE";
- public static final String EJB_WEBLOGIC = "EJB_WEBLOGIC";
- public static final String EJB_ORACLE = "EJB_ORACLE";
- public static final String EJB_ORION = "EJB_ORION";
- public static final String EJB_JRUN = "EJB_JRUN";
-
- public static final String WEB_JBOSS = "WEB_JBOSS";
- public static final String WEB_JONAS = "WEB_JONAS";
- public static final String WEB_WEBSPHERE = "WEB_WEBSPHERE";
- public static final String WEB_WEBLOGIC = "WEB_WEBLOGIC";
- public static final String WEB_ORACLE = "WEB_ORACLE";
- public static final String WEB_ORION = "WEB_ORION";
- public static final String WEB_JRUN = "WEB_JRUN";
-
- private static IPreferenceStore getPreferenceStore() {
- if (preferenceStore == null) {
- preferenceStore = XDocletAnnotationPlugin.getDefault().getPreferenceStore();
- }
- return preferenceStore;
- }
-
- public static String getPropertyRaw(String item) {
- return getPreferenceStore().getString(item);
- }
-
-
- public static void setProperty(String prefix,String item, String value) {
- getPreferenceStore().setValue(XDocletAnnotationPlugin.PLUGINID+"."+prefix+"."+item+".value",value);
- }
- public static void setProperty(String item, String value) {
- String prefix = XDocletAnnotationPlugin.PLUGINID+".";
- getPreferenceStore().setValue(prefix+item+".value",value);
- }
-
- public static String getProperty(String item) {
- String prefix = XDocletAnnotationPlugin.PLUGINID+".";
- return getPreferenceStore().getString(prefix+item+".value");
- }
- public static String getProperty(String prefix,String item) {
- String pfix = XDocletAnnotationPlugin.PLUGINID+"."+prefix+"."+item+".value";
- return getPreferenceStore().getString(pfix);
- }
-
-
-
- public static boolean isPropertyActive(String item) {
- String prefix = XDocletAnnotationPlugin.PLUGINID+".";
- return getPreferenceStore().getBoolean(prefix+item);
- }
-
- public static void setPropertyActive(String item, boolean active) {
- String prefix = XDocletAnnotationPlugin.PLUGINID+".";
- getPreferenceStore().setValue(prefix+item, active);
- }
-
-
- public static void initializeDefaultPreferences(IPreferenceStore store)
- {
- String prefix = XDocletAnnotationPlugin.PLUGINID+".";
- store.setDefault(prefix+ XDOCLETFORCE + ".value", "true");
- store.setDefault(prefix+ XDOCLETVERSION + ".value", "1.2.1");
- store.setDefault(prefix+ EJB_JBOSS + "_VERSION.value", "2.4");
- store.setDefault(prefix+ EJB_JONAS + "_VERSION.value", "2.6");
- store.setDefault(prefix+ EJB_WEBLOGIC + "_VERSION.value", "6.1");
- store.setDefault(prefix+ EJB_WEBSPHERE + "_VERSION.value", "all");
-
- store.setDefault(prefix+ WEB_JBOSS + "_VERSION.value", "2.4");
- store.setDefault(prefix+ WEB_JONAS + "_VERSION.value", "2.6");
- store.setDefault(prefix+ WEB_WEBLOGIC + "_VERSION.value", "6.1");
- store.setDefault(prefix+ WEB_WEBSPHERE + "_VERSION.value", "all");
-
-
- store.setDefault(prefix +"."+XDOCLETBUILDERACTIVE , true);
- store.setDefault(prefix +"."+EJB_JBOSS , false);
- store.setDefault(prefix +"."+EJB_JONAS , false);
- store.setDefault(prefix +"."+EJB_WEBSPHERE , false);
- store.setDefault(prefix +"."+EJB_WEBLOGIC , false);
- store.setDefault(prefix +"."+EJB_ORACLE , false);
- store.setDefault(prefix +"."+EJB_ORION , false);
- store.setDefault(prefix +"."+EJB_JRUN , false);
-
- store.setDefault(prefix +"."+WEB_JBOSS , false);
- store.setDefault(prefix +"."+WEB_JONAS , false);
- store.setDefault(prefix +"."+WEB_WEBSPHERE , false);
- store.setDefault(prefix +"."+WEB_WEBLOGIC , false);
- store.setDefault(prefix +"."+WEB_ORACLE , false);
- store.setDefault(prefix +"."+WEB_ORION , false);
- store.setDefault(prefix +"."+WEB_JRUN , false);
-}
-
-}
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 9ae94e7..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletRuntime.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.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 {
-
- // relative path to the libraries
- public final static String ID = "XDoxlet";
-
- public final static String LIBPATH = "lib";
-
- public final static String VERSIONS[] = { "1.2.1", "1.2.2", "1.2.3" };
-
- // 1.2.2
- private String version = "1.2.2";
-
- // location of the axis installation
- private String home = "";
-
- private String libs[][][] = {
- {
- { "1.2.1" },
- { "xdoclet-1.2.1.jar", "xjavadoc-1.0.3.jar",
- "xdoclet-xdoclet-module-1.2.1.jar",
- "xdoclet-ejb-module-1.2.1.jar",
- "commons-collections-2.0.jar",
- "commons-logging.jar" } },
- {
- { "1.2.2" },
- { "xdoclet-1.2.2.jar", "xjavadoc-1.1.jar",
- "xdoclet-xdoclet-module-1.2.2.jar",
- "xdoclet-ejb-module-1.2.2.jar",
- "commons-collections-2.0.jar",
- "commons-logging.jar" } },
- {
- { "1.2.3" },
- { "xdoclet-1.2.3.jar", "xjavadoc-1.1.jar",
- "xdoclet-xdoclet-module-1.2.3.jar",
- "xdoclet-ejb-module-1.2.3.jar",
- "commons-collections-2.0.jar",
- "commons-logging.jar" } }
-
- };
-
- /**
- * @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(String version) {
- for (int i = 0; i < libs.length; i++) {
- if (version.equals(libs[i][0][0]))
- return libs[i][1];
-
- }
- return null;
- }
-
- /**
- * @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;
- }
-
- public static XDocletRuntime getPreferredRuntime() {
- XDocletRuntime axisRuntime = new XDocletRuntime();
- axisRuntime.setHome(XDocletPreferenceStore.getProperty("AXIS", "home"));
- axisRuntime.setVersion(XDocletPreferenceStore.getProperty("AXIS",
- "version"));
- return axisRuntime;
- }
-
- /**
- * @return
- */
- public URL getHomeURL() throws MalformedURLException {
- return (new File(getHome())).toURL();
- }
-
- public IStatus[] validate(String version) {
- ArrayList errors = new ArrayList();
- String[] vLibs = this.getLibs(version);
- 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(String version) {
- return validate(version).length == 0;
- }
-}
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 31e2d98..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletWebAntProjectBuilder.java
+++ /dev/null
@@ -1,223 +0,0 @@
-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.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.J2EEVersionConstants;
-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("@jboss@", addJbossTask(contextRoot)); //$NON-NLS-1$
- templates.put("@jonas@", addJonasTask(contextRoot)); //$NON-NLS-1$
- templates.put("@weblogic@", addWeblogicTask(contextRoot)); //$NON-NLS-1$
- templates.put("@websphere@", addWebSphereTask(contextRoot)); //$NON-NLS-1$
-
- return templates;
- }
-
- 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);
- int j2eeVersion = 0;
- if (webEdit != null) {
- j2eeVersion = webEdit.getJ2EEVersion();
- //TODO
- contextRoot = webEdit.getServerContextRoot();
- }
- 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", XDocletPreferenceStore.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 = J2EEVersionConstants.VERSION_2_2_TEXT;
- 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;
- }
-
-
- private String addJbossTask(String contextRoot) {
- if (!XDocletPreferenceStore.isPropertyActive(XDocletPreferenceStore.WEB_JBOSS))
- return ""; //$NON-NLS-1$
- return "<jbosswebxml version=\""
- + XDocletPreferenceStore.getProperty(XDocletPreferenceStore.WEB_JBOSS + "_VERSION") + "\""
- + " contextroot=\""+contextRoot+"\""
- + " xmlencoding=\"UTF-8\""
- + " destdir=\"\\${web.dd.dir}\""
- + " validatexml=\"false\""
- + " mergedir=\"\\${web.dd.dir}\" />";
-
- }
-
- private String addJonasTask(String contextRoot) {
- if (!XDocletPreferenceStore.isPropertyActive(XDocletPreferenceStore.WEB_JONAS))
- return ""; //$NON-NLS-1$
- return "<jonaswebxml version=\""
- + XDocletPreferenceStore.getProperty(XDocletPreferenceStore.WEB_JONAS + "_VERSION") + "\""
- + " contextroot=\""+contextRoot+"\""
- + " xmlencoding=\"UTF-8\""
- + " destdir=\"\\${web.dd.dir}\""
- + " validatexml=\"false\""
- + " mergedir=\"\\${web.dd.dir}\" />";
-
- }
-
- private String addWeblogicTask(String contextRoot) {
- if (!XDocletPreferenceStore.isPropertyActive(XDocletPreferenceStore.WEB_WEBLOGIC))
- return ""; //$NON-NLS-1$
- return "<weblogicwebxml version=\""
- + XDocletPreferenceStore.getProperty(XDocletPreferenceStore.WEB_WEBLOGIC + "_VERSION") + "\""
- + " contextRoot=\""+contextRoot+"\""
- + " xmlencoding=\"UTF-8\""
- + " destdir=\"\\${web.dd.dir}\""
- + " validatexml=\"false\""
- + " mergedir=\"\\${web.dd.dir}\" />";
-
- }
-
- private String addWebSphereTask(String contextRoot) {
- if (!XDocletPreferenceStore.isPropertyActive(XDocletPreferenceStore.WEB_WEBSPHERE))
- return ""; //$NON-NLS-1$
- return "<webspherewebxml "
- + " xmlencoding=\"UTF-8\""
- + " destdir=\"\\${web.dd.dir}\""
- + " validateXML=\"false\""
- + " mergedir=\"\\${web.dd.dir}\" />";
- }
-
-
-}
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/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 7e55459..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,171 +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.resources.IncrementalProjectBuilder;
-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.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.MessageDrivenEjbEmitter;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.emitter.SessionEjbEmitter;
-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() {
- XDocletRuntime runtime = new XDocletRuntime();
- runtime.setHome(XDocletPreferenceStore.getProperty(XDocletPreferenceStore.XDOCLETHOME));
- runtime.setVersion(XDocletPreferenceStore.getProperty(XDocletPreferenceStore.XDOCLETVERSION));
- return runtime.isValid(XDocletPreferenceStore.getProperty(XDocletPreferenceStore.XDOCLETVERSION));
- }
-
- 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);
- project.build(IncrementalProjectBuilder.FULL_BUILD, monitor);
-
-
- }
-
- 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);
- project.build(IncrementalProjectBuilder.FULL_BUILD, monitor);
-
- }
-
- 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/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 b67fbbe..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,187 +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.ResourceBundle;
-
-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(bundle.getString("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/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 1986d23..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,164 +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 java.util.ResourceBundle;
-import java.util.StringTokenizer;
-
-import org.eclipse.jface.preference.PreferencePage;
-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.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-
-public class XDocletEJBPreferencePage extends PreferencePage implements
- IWorkbenchPreferencePage, SelectionListener {
-
- private static ResourceBundle bundle = ResourceBundle.getBundle("org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.ui.preferences");
-
- private static final String[][] ejboptions={
- { XDocletPreferenceStore.EJB_JBOSS, "JBoss", bundle.getString("desc_ejbdoclet_jboss"), "CHECK","2.4,3.0,3.0.1,3.0.2,3.0.3,3.2,4.0","2.4"},
- { XDocletPreferenceStore.EJB_JONAS, "JOnAS", bundle.getString("desc_ejbdoclet_jonas"), "CHECK","2.3,2.4,2.5,2.6,3.0","2.6"},
- { XDocletPreferenceStore.EJB_WEBLOGIC, "WebLogic", bundle.getString("desc_ejbdoclet_weblogic"), "CHECK","6.0,6.1,7.0,8.1","6.1" },
- { XDocletPreferenceStore.EJB_WEBSPHERE, "WebSphere", bundle.getString("desc_ejbdoclet_websphere"), "CHECK", "all","all"}
-
- };
-
- DialogPanel panel;
-
- 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);
- 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);
-
-
-
- Label label = new Label(defPanel, SWT.WRAP);
- gridData = new GridData();
- gridData.horizontalSpan = 4;
- label.setLayoutData(gridData);
- label.setText(bundle.getString("label_set_ejbdoclet_preference"));
-
- panel.preferences = new Control[ejboptions.length];
- panel.fActive = new Button[ejboptions.length];
-
- for (int i = 0; i < ejboptions.length; i++) {
- String versions[] = parseVersions(ejboptions[i][4]);
- panel.preferences[i] = panel.createLabeledCombo(i,XDocletPreferenceStore.isPropertyActive(ejboptions[i][0]),
- ejboptions[i][1]+":",
- ejboptions[i][2],
- XDocletPreferenceStore.getProperty(ejboptions[i][0]+"_VERSION"),versions,defPanel);
- }
-
- return composite;
- }
-
-
-
-
- /**
- * @param string
- * @return
- */
- private String[] parseVersions(String string) {
- StringTokenizer tokenizer = new StringTokenizer(string,",");
- int i=0, count = tokenizer.countTokens();
- String[] versions = new String[count];
- while (tokenizer.hasMoreTokens()) {
- versions[i++]=tokenizer.nextToken();
- }
- return versions;
- }
-
-
-
- public boolean performOk() {
- for (int i = 0; i < ejboptions.length; i++) {
- Combo combo = ((Combo)panel.preferences[i]);
- boolean itemActive = panel.fActive[i].getSelection();
- String itemValue = combo.getItem(combo.getSelectionIndex());
- XDocletPreferenceStore.setProperty(ejboptions[i][0]+"_VERSION",itemValue);
- XDocletPreferenceStore.setPropertyActive(ejboptions[i][0],itemActive);
- }
- 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 3db5a94..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,163 +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.ResourceBundle;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.preference.PreferencePage;
-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;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-
-public class XDocletPreferencePage extends PreferencePage implements
- IWorkbenchPreferencePage, SelectionListener {
-
- DialogPanel panel;
-
-
-
- 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();
- 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(bundle.getString("label_set_xdoclet_runtime_preference"));
-
- panel.preferences = new Control[3];
- panel.fActive = new Button[3];
- panel.preferences[0] = panel.createLabeledCheck(0,false,XDocletPreferenceStore.isPropertyActive(XDocletPreferenceStore.XDOCLETBUILDERACTIVE),bundle.getString("label_enable_xdoclet_builder"),bundle.getString("desc_enable_xdoclet_builder"),XDocletPreferenceStore.isPropertyActive(XDocletPreferenceStore.XDOCLETBUILDERACTIVE),defPanel);
- panel.preferences[2] = panel.createLabeledPath(2,true,bundle.getString("label_xdoclet_home"),bundle.getString("desc_xdoclet_home"),XDocletPreferenceStore.getProperty(XDocletPreferenceStore.XDOCLETHOME),defPanel);
- panel.preferences[1] = panel.createLabeledCombo(1,false,true,bundle.getString("label_xdoclet_version"),bundle.getString("desc_xdoclet_version"),XDocletPreferenceStore.getProperty(XDocletPreferenceStore.XDOCLETVERSION),new String[]{"1.2.1","1.2.2","1.2.3"},defPanel);
- final Text xDocletPath = (Text)panel.preferences[2];
- final Combo xDocletVersion = (Combo)panel.preferences[1];
- ModifyListener listener = new ModifyListener(){
-
- public void modifyText(ModifyEvent e) {
- XDocletRuntime runtime = new XDocletRuntime();
- runtime.setHome(xDocletPath.getText());
- IStatus []result = runtime.validate(xDocletVersion.getItem(xDocletVersion.getSelectionIndex()));
- // Clear the message
- XDocletPreferencePage.this.setErrorMessage(null);
- if(result.length > 0){
- XDocletPreferencePage.this.setErrorMessage(result[0].getMessage());
- //XDocletPreferencePage.this.setValid(false);
- }else{
- setMessage("All libraries found", IMessageProvider.INFORMATION);
- //XDocletPreferencePage.this.setValid(true);
- }
-
- }};
-
- xDocletPath.addModifyListener(listener);
- xDocletVersion.addModifyListener(listener);
- return composite;
- }
-
-
- public boolean performOk() {
-
- String itemValue = "";
- itemValue = ((Text)panel.preferences[2]).getText();
- XDocletPreferenceStore.setProperty(XDocletPreferenceStore.XDOCLETHOME,itemValue);
-
- Combo combo = ((Combo)panel.preferences[1]);
- int itemIndex = combo.getSelectionIndex();
- if(itemIndex != -1){
- itemValue = combo.getItem(combo.getSelectionIndex());
- XDocletPreferenceStore.setProperty(XDocletPreferenceStore.XDOCLETVERSION,itemValue);
- }else{
- return false;
- }
-
- XDocletPreferenceStore.setPropertyActive(XDocletPreferenceStore.XDOCLETBUILDERACTIVE,((Button)panel.preferences[0]).getSelection() );
-
- 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/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 5c41884..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,164 +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 java.util.ResourceBundle;
-import java.util.StringTokenizer;
-
-import org.eclipse.jface.preference.PreferencePage;
-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.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-
-public class XDocletWebPreferencePage extends PreferencePage implements
- IWorkbenchPreferencePage, SelectionListener {
-
- private static ResourceBundle bundle = ResourceBundle.getBundle("org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.ui.preferences");
-
- private static final String[][] weboptions={
- { XDocletPreferenceStore.WEB_JBOSS, "JBoss", bundle.getString("desc_webdoclet_jboss"), "CHECK","2.4,3.0,3.0.1,3.0.2,3.0.3,3.2,4.0","2.4"},
- { XDocletPreferenceStore.WEB_JONAS, "JOnAS", bundle.getString("desc_webdoclet_jonas"), "CHECK","2.3,2.4,2.5,2.6,3.0","2.6"},
- { XDocletPreferenceStore.WEB_WEBLOGIC, "WebLogic", bundle.getString("desc_webdoclet_weblogic"), "CHECK","6.0,6.1,7.0,8.1","6.1" },
- { XDocletPreferenceStore.WEB_WEBSPHERE, "WebSphere", bundle.getString("desc_webdoclet_websphere"), "CHECK", "all","all"}
-
- };
-
- DialogPanel panel;
-
- 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);
- 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);
-
-
-
- Label label = new Label(defPanel, SWT.WRAP);
- gridData = new GridData();
- gridData.horizontalSpan = 4;
- label.setLayoutData(gridData);
- label.setText(bundle.getString("label_set_webdoclet_preference"));
-
- panel.preferences = new Control[weboptions.length];
- panel.fActive = new Button[weboptions.length];
-
- for (int i = 0; i < weboptions.length; i++) {
- String versions[] = parseVersions(weboptions[i][4]);
- panel.preferences[i] = panel.createLabeledCombo(i,XDocletPreferenceStore.isPropertyActive(weboptions[i][0]),
- weboptions[i][1]+":",
- weboptions[i][2],
- XDocletPreferenceStore.getProperty(weboptions[i][0]+"_VERSION"),versions,defPanel);
- }
-
- return composite;
- }
-
-
-
-
- /**
- * @param string
- * @return
- */
- private String[] parseVersions(String string) {
- StringTokenizer tokenizer = new StringTokenizer(string,",");
- int i=0, count = tokenizer.countTokens();
- String[] versions = new String[count];
- while (tokenizer.hasMoreTokens()) {
- versions[i++]=tokenizer.nextToken();
- }
- return versions;
- }
-
-
-
- public boolean performOk() {
- for (int i = 0; i < weboptions.length; i++) {
- Combo combo = ((Combo)panel.preferences[i]);
- boolean itemActive = panel.fActive[i].getSelection();
- String itemValue = combo.getItem(combo.getSelectionIndex());
- XDocletPreferenceStore.setProperty(weboptions[i][0]+"_VERSION",itemValue);
- XDocletPreferenceStore.setPropertyActive(weboptions[i][0],itemActive);
- }
- 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 a2b54b2..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,20 +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_set_ejbdoclet_preference=Set EJB Doclet Preferences (choose the servers to generate specific deployment descriptors)
-desc_ejbdoclet_jboss= Creates jboss.xml, jaws.xml and/or jbosscmp-jdbc.xml deployment descriptors for JBoss.
-desc_ejbdoclet_jonas= Generates the deployment descriptor for JOnAS.
-desc_ejbdoclet_weblogic=This task can generate deployment descriptors for WLS 6.0, 6.1, 7.0 and 8.1.
-desc_ejbdoclet_websphere=This task can generate deployment descriptors for WAS
-
-label_set_webdoclet_preference=Set Web Doclet Preferences (choose the servers to generate specific deployment descriptors)
-desc_webdoclet_jboss= Creates deployment descriptors for JBoss.
-desc_webdoclet_jonas= Generates the deployment descriptor for JOnAS.
-desc_webdoclet_weblogic=This task can generate deployment descriptors for WLS 6.0, 6.1, 7.0 and 8.1.
-desc_webdoclet_websphere=This task can generate deployment descriptors for WAS
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 b9b6f25..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,260 +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.ant.internal.ui.launchConfigurations.AntJRETab;
-import org.eclipse.ant.internal.ui.launchConfigurations.IAntLaunchConfigurationConstants;
-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.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletAnnotationPlugin;
-import org.eclipse.ui.externaltools.internal.model.IExternalToolConstants;
-
-public class AntLauncherUtility {
-
- private static final int MAX_TARGET_APPEND_LENGTH = 30;
-
- private URL url;
-
- private IPath output;
-
- private Properties properties;
-
- private Map templates;
-
- private boolean useLauncher = false;
-
- public AntLauncherUtility(URL templateUrl, IPath outputFolder,
- Properties properties, Map templates) {
- this.url = templateUrl;
- this.output = outputFolder;
- 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(IAntLaunchConfigurationConstants.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(IExternalToolConstants.ATTR_LOCATION, filePath
- .toString());
- workingCopy.setAttribute(
- IJavaLaunchConfigurationConstants.ATTR_CLASSPATH_PROVIDER,
- "org.eclipse.ant.ui.AntClasspathProvider"); //$NON-NLS-1$
- workingCopy.setAttribute(
- IAntLaunchConfigurationConstants.ATTR_ANT_TARGETS,
- targetAttribute);
-
- // set default for common settings
- CommonTab tab = new CommonTab();
- tab.setDefaults(workingCopy);
- tab.dispose();
-
- AntJRETab jreTab = new AntJRETab();
- jreTab.setDefaults(workingCopy);
- jreTab.dispose();
- workingCopy.setAttribute(IDebugUIConstants.ATTR_LAUNCH_IN_BACKGROUND,
- false);
-
- return workingCopy.doSave();
- }
-
- /**
- * 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 4bcb820..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/builder/xdoclet.xml
+++ /dev/null
@@ -1,120 +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 -->
-
- <dataobject/>
- <dao pattern="{0}" destdir="${ejb.project.dir}/${ejb.module.gen}"/>
-
- <valueobject/>
- <utilobject cacheHomes="true" includeGUID="true" kind="physical"/>
-
- <remoteinterface/>
- <localinterface/>
- <homeinterface />
- <localhomeinterface/>
-
- <entitypk/>
- <entitycmp/>
- <entitybmp/>
- <session/>
- <mdb/>
-
- @deploymentdescriptor@
-
-
- @jboss@
- @jonas@
- @weblogic@
- @websphere@
-
-
- </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 1aa1b03..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/builder/xdocletweb.xml
+++ /dev/null
@@ -1,89 +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.gen}"
- 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 -->
- <deploymentdescriptor servletspec="${servlet.spec.version}" destdir="${web.dd.dir}">
- </deploymentdescriptor>
-
-
-
- @jboss@
- @jonas@
- @weblogic@
- @websphere@
-
-
-
- </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 7216ba5..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/entity/fields.javajet
+++ /dev/null
@@ -1,6 +0,0 @@
-<%@ jet package="com.objectlearn.gmf.templates.entity" class="FieldGenerator" imports="java.util.* com.objectlearn.lomboz.xml.lomboz.DocumentRoot com.objectlearn.lomboz.xml.lomboz.EntityBean com.objectlearn.lomboz.xml.lomboz.FieldMapping com.sun.java.xml.ns.j2ee.EntityBeanType"%>
-<% DocumentRoot root = (DocumentRoot)argument;
- EntityBean leb = (EntityBean) root.getEjb().getEntity();
- EntityBeanType eb = leb.getEntityEjb();
- boolean isCMP = "Container".equals(eb.getPersistenceType().getValue());
-%>
\ 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 8d4e33b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/entity/methodStubs.javajet
+++ /dev/null
@@ -1,131 +0,0 @@
-<%@ jet package="com.objectlearn.gmf.templates.entity" class="MethodGenerator" imports="java.util.* com.objectlearn.lomboz.xml.lomboz.DocumentRoot com.objectlearn.lomboz.xml.lomboz.EntityBean com.objectlearn.lomboz.xml.lomboz.FieldMapping com.sun.java.xml.ns.j2ee.EntityBeanType com.sun.java.xml.ns.j2ee.FullyQualifiedClassType "%>
-<% DocumentRoot root = (DocumentRoot)argument;
- EntityBean leb = (EntityBean) root.getEjb().getEntity();
- EntityBeanType eb = leb.getEntityEjb();
- boolean isCMP = "Container".equals(eb.getPersistenceType().getValue());
-
- String primaryKeyType = "java.lang.String";
- int pkCount=0;
- boolean isComposite = false;
- boolean createCompositeKey = false;
- if( isCMP ) {
- FullyQualifiedClassType pkClassType = eb.getPrimKeyClass();
- if(pkClassType != null && pkClassType.getValue() != null && pkClassType.getValue().length() > 0 )
- primaryKeyType = pkClassType.getValue();
- Iterator fieldMappings = leb.getFieldMappings().iterator();
- String pkType = "";
- while(fieldMappings.hasNext()){
- FieldMapping mapping = (FieldMapping) fieldMappings.next();
- if(mapping.isPrimaryKey()){
- pkType = mapping.getFieldType().getValue();
- pkCount++;
- }
- }
- isComposite = pkCount > 1;
- if(!isComposite )
- primaryKeyType = pkType;
- else if(pkClassType == null || pkClassType.getValue() == null || pkClassType.getValue().length() < 1 ){
- createCompositeKey = true;
- primaryKeyType = eb.getEjbClass().getValue()+".PrimaryKey";
- }else if(pkClassType != null && pkClassType.getValue() != null ){
- if(primaryKeyType.equals(eb.getEjbClass().getValue()+".PrimaryKey") )
- createCompositeKey = true;
- }
- }
-%>
-
-/**
- *
- * <!-- 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
-}
-
-<% if( isCMP ) {
- Iterator fieldMappings = leb.getFieldMappings().iterator();
- while(fieldMappings.hasNext()){
- FieldMapping mapping = (FieldMapping) fieldMappings.next();
-
-%>
-
-/**
-*
-*
-* <!-- begin-user-doc -->
-* CMP Field <%= mapping.getFieldName().getValue() %>
-*
-* Returns the <%= mapping.getFieldName().getValue() %>
-* @return the <%= mapping.getFieldName().getValue() %>
-*
-* <!-- end-user-doc -->
-*
-* <!-- begin-xdoclet-definition -->
-*
-* @ejb.persistent-field
-* @ejb.persistence
-* column-name="<%= mapping.getColumnName().getValue() %>"
-* jdbc-type="<%= mapping.getJdbcType().getValue() %>"
-* sql-type="<%= mapping.getSqlType().getValue() %>"
-* read-only="<%= mapping.isReadOnly() %>"
-* <%= (mapping.isPrimaryKey() ? "@ejb.pk-field" : "" ) %>
-*
-* @ejb.interface-method
-*
-* <!-- end-xdoclet-definition -->
-* @generated
-*/
-<%
- String methodName = mapping.getFieldName().getValue();
- methodName = Character.toUpperCase(methodName.charAt(0)) + methodName.substring(1,methodName.length());
-
-%>
-public abstract <%= mapping.getFieldType().getValue() %> get<%= methodName %>();
-
-
-/**
-* <!-- begin-user-doc -->
-* Sets the <%= mapping.getFieldName().getValue() %>
-*
-* @param <%= mapping.getFieldType().getValue() %> the new <%= mapping.getFieldName().getValue() %> value
-* <!-- end-user-doc -->
-*
-* <!-- begin-xdoclet-definition -->
-* @ejb.interface-method
-* <!-- end-xdoclet-definition -->
-* @generated
-*/
-public abstract void set<%= methodName %>(<%= mapping.getFieldType().getValue() %> <%= mapping.getFieldName().getValue() %>);
-
-
-
-<%
-}
-}
-%>
-
-
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 234b53b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/entity/typeComment.javajet
+++ /dev/null
@@ -1,88 +0,0 @@
-<%@ jet package="com.objectlearn.gmf.templates.entity" class="TypeCommentGenerator" imports="java.util.* com.objectlearn.lomboz.xml.lomboz.DocumentRoot com.objectlearn.lomboz.xml.lomboz.EntityBean com.objectlearn.lomboz.xml.lomboz.FieldMapping com.sun.java.xml.ns.j2ee.EntityBeanType com.sun.java.xml.ns.j2ee.FullyQualifiedClassType"%>
-<% DocumentRoot root = (DocumentRoot)argument;
- EntityBean leb = (EntityBean) root.getEjb().getEntity();
- EntityBeanType eb = leb.getEntityEjb();
- boolean isCMP = "Container".equals(eb.getPersistenceType().getValue());
- String ejbName = eb.getEjbClass().getUnqualifiedClassName();
- if(ejbName.endsWith("Bean") ){
- ejbName = ejbName.substring(0,ejbName.length()-4);
- }else if(ejbName.endsWith("Ejb") ){
- ejbName = ejbName.substring(0,ejbName.length()-3);
- }
-
- String primaryKeyType = "java.lang.String";
- int pkCount=0;
- boolean isComposite = false;
- boolean createCompositeKey = false;
- if( isCMP ) {
- FullyQualifiedClassType pkClassType = eb.getPrimKeyClass();
- if(pkClassType != null && pkClassType.getValue() != null && pkClassType.getValue().length() > 0 )
- primaryKeyType = pkClassType.getValue();
- Iterator fieldMappings = leb.getFieldMappings().iterator();
- String pkType = "";
- while(fieldMappings.hasNext()){
- FieldMapping mapping = (FieldMapping) fieldMappings.next();
- if(mapping.isPrimaryKey()){
- pkType = mapping.getFieldType().getValue();
- pkCount++;
- }
- }
- isComposite = pkCount > 1;
- if(!isComposite )
- primaryKeyType = pkType;
- else if(pkClassType == null || pkClassType.getValue() == null || pkClassType.getValue().length() < 1 ){
- createCompositeKey = true;
- primaryKeyType = eb.getEjbClass().getValue()+".PrimaryKey";
- }else if(pkClassType != null && pkClassType.getValue() != null ){
- if(primaryKeyType.equals(eb.getEjbClass().getValue()+".PrimaryKey") )
- createCompositeKey = true;
- }
- }
-%>
-
-/**
- *
- * <!-- begin-user-doc -->
- * You can insert your documentation for '<em><b><%=eb.getEjbClass().getUnqualifiedClassName()%></b></em>'.
- * <!-- end-user-doc -->
- *
- <!-- begin-lomboz-definition -->
- <%= root.asString() %>
- <!-- end-lomboz-definition -->
- *
- * <!-- begin-xdoclet-definition -->
-<% if( isCMP ) { %>
- * @ejb.bean name="<%=ejbName%>"
- * jndi-name="<%=eb.getEjbName()%>"
- * type="CMP"<%if(eb.getPrimkeyField() != null ){%>
- * primkey-field="<%= eb.getPrimkeyField().getValue() %>"<%}%>
- * schema="<%= eb.getAbstractSchemaName().getValue() %>"
- * cmp-version="<%= eb.getCmpVersion().getValue() %>"
- * data-source="<%=leb.getDataSourceName()%>"
- *
- * @ejb.persistence
- * table-name="<%=leb.getTableName()%>"
- *
- * @ejb.finder
- * query="SELECT OBJECT(a) FROM <%= eb.getAbstractSchemaName().getValue() %> as a"
- * signature="java.util.Collection findAll()"
- *
- * @ejb.pk class="<%= primaryKeyType %>"
- * <!-- end-xdoclet-definition -->
- * @generated
- **/
-
-<% } else { %>
-
-
-
-/**
- * @ejb.bean name="<%=ejbName%>"
- * jndi-name="<%=eb.getEjbName()%>"
- * type="BMP"
- *
- * <!-- end-xdoclet-defintion -->
- * @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 3d72656..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/entity/typeStub.javajet
+++ /dev/null
@@ -1,57 +0,0 @@
-<%@ jet package="com.objectlearn.gmf.templates.entity" class="TypeStubGenerator" imports="java.util.* com.objectlearn.lomboz.xml.lomboz.DocumentRoot com.objectlearn.lomboz.xml.lomboz.EntityBean com.objectlearn.lomboz.xml.lomboz.FieldMapping com.sun.java.xml.ns.j2ee.EntityBeanType com.sun.java.xml.ns.j2ee.FullyQualifiedClassType"%>
-<% DocumentRoot root = (DocumentRoot)argument;
- EntityBean leb = (EntityBean) root.getEjb().getEntity();
- EntityBeanType eb = leb.getEntityEjb();
- boolean isCMP = "Container".equals(eb.getPersistenceType().getValue());
-
- String primaryKeyType = "java.lang.String";
- int pkCount=0;
- boolean isComposite = false;
- boolean createCompositeKey = false;
- if( isCMP ) {
- FullyQualifiedClassType pkClassType = eb.getPrimKeyClass();
- if(pkClassType != null && pkClassType.getValue() != null && pkClassType.getValue().length() > 0 )
- primaryKeyType = pkClassType.getValue();
- Iterator fieldMappings = leb.getFieldMappings().iterator();
- String pkType = "";
- while(fieldMappings.hasNext()){
- FieldMapping mapping = (FieldMapping) fieldMappings.next();
- if(mapping.isPrimaryKey()){
- pkType = mapping.getFieldType().getValue();
- pkCount++;
- }
- }
- isComposite = pkCount > 1;
- if(!isComposite )
- primaryKeyType = pkType;
- else if(pkClassType == null || pkClassType.getValue() == null || pkClassType.getValue().length() < 1 ){
- createCompositeKey = true;
- primaryKeyType = eb.getEjbClass().getValue()+".PrimaryKey";
- }else if(pkClassType != null && pkClassType.getValue() != null ){
- if(primaryKeyType.equals(eb.getEjbClass().getValue()+".PrimaryKey") )
- createCompositeKey = true;
- }
- }
-%>
-public abstract class <%=eb.getEjbClass().getUnqualifiedClassName()%> implements javax.ejb.EntityBean {
-
-<% if(createCompositeKey ){ %>
- /**
- * Generated Primary Key Class
- * @generated
- */
- public class PrimaryKey {
-<%
- Iterator fieldMappings = leb.getFieldMappings().iterator();
- while(fieldMappings.hasNext()){
- FieldMapping mapping = (FieldMapping) fieldMappings.next();
- if(mapping.isPrimaryKey()){ %>
- /**
- * @generated
- */
- public <%= mapping.getFieldType().getValue() %> <%= mapping.getFieldName().getValue() %> ;
-<% } }%>
- }
-<% }%>
-
-}
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/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 ce2d0c4..0000000
--- a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/plugin.xml
+++ /dev/null
@@ -1,39 +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"/>
- </requires>
-
-</plugin>
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/AllEJBGenerationTests.java b/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/common/AllEJBGenerationTests.java
deleted file mode 100644
index 8fe4263..0000000
--- a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/common/AllEJBGenerationTests.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.eclipse.jst.j2ee.ejb.generation.tests.common;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllEJBGenerationTests {
-
- public static Test suite() {
- TestSuite suite = new TestSuite("Test for org.eclipse.jst.j2ee.ejb.generation.tests.common");
- //$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.addTestSuite(EjbModuleCreationTest.class);
- suite.addTestSuite(ExistenceTest.class);
-
-
- //$JUnit-END$
- return suite;
- }
-
-
-
-}
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 dba82f7..0000000
--- a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/common/AnnotationTest.java
+++ /dev/null
@@ -1,229 +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.j2ee.application.internal.operations.FlexibleJavaProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.EnterpriseBeanClassDataModel;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.SessionBeanDataModel;
-import org.eclipse.jst.j2ee.internal.ejb.archiveoperations.EjbComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.servertarget.J2EEProjectServerTargetDataModel;
-import org.eclipse.jst.server.generic.core.internal.GenericServerRuntime;
-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";
- public static final String BEAN_PACKAGE = "com.farm";
- public static final String BEAN_CLASS = "CowBean";
- public final static String ID = "org.eclipse.jst.server.generic.jonas414";
-
- /**
- *
- */
- public AnnotationTest() {
- super();
- }
-
- /**
- * @param name
- */
- public AnnotationTest(String name) {
- super(name);
- }
-
- protected TestProject testProject;
- public static final String XDOCLET = "XDoclet";
-
- protected IDataModelOperation createFlexibleProject() throws Exception {
- FlexibleJavaProjectCreationDataModelProvider provider = new FlexibleJavaProjectCreationDataModelProvider();
- IDataModel creationDataModel = provider.getDataModel();
- creationDataModel.setProperty(FlexibleJavaProjectCreationDataModelProvider.PROJECT_NAME, PROJECT_NAME);
- IRuntime runtime = getRuntimeTarget();
- creationDataModel.setProperty(J2EEProjectServerTargetDataModel.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 (ID.equals(sType.getId()))
- serverType = sType;
- }
- assertNotNull("Could not find org.eclipse.jst.server.generic.jonas414 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.getAdapter(RuntimeDelegate.class);
- 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 EnterpriseBeanClassDataModel createDefaultSessionModel() {
- SessionBeanDataModel model = new SessionBeanDataModel();
- model.setProperty(SessionBeanDataModel.ANNOTATIONPROVIDER, XDOCLET);
-
- model.setProperty(SessionBeanDataModel.SUPERCLASS, model.getEjbSuperclassName());
- model.setProperty(SessionBeanDataModel.INTERFACES, model.getEJBInterfaces());
- model.setBooleanProperty(SessionBeanDataModel.MODIFIER_ABSTRACT, true);
- model.setProperty(SessionBeanDataModel.CLASS_NAME, BEAN_CLASS);
- model.setProperty(SessionBeanDataModel.JAVA_PACKAGE, BEAN_PACKAGE);
-
- model.setProperty(SessionBeanDataModel.PROJECT_NAME, PROJECT_NAME);
- model.setProperty(SessionBeanDataModel.MODULE_NAME, MODULE_NAME);
-
- model.setProperty(SessionBeanDataModel.EJB_NAME, EJB_NAME);
- model.setProperty(SessionBeanDataModel.JNDI_NAME, EJB_NAME);
- model.setProperty(SessionBeanDataModel.DISPLAY_NAME, EJB_NAME);
- return model;
- }
-
- protected IDataModelOperation createEjbModuleAndProject() throws Exception {
-
- IDataModelOperation flexibleJavaProjectCreationOperation = createFlexibleProject();
- flexibleJavaProjectCreationOperation.execute(new NullProgressMonitor(),null);
- EjbComponentCreationDataModelProvider aProvider = new EjbComponentCreationDataModelProvider();
- IDataModel a = aProvider.getDataModel();
- a.setBooleanProperty(EjbComponentCreationDataModelProvider.ADD_TO_EAR, false);
- a.setProperty(EjbComponentCreationDataModelProvider.COMPONENT_NAME, MODULE_NAME);
- a.setProperty(EjbComponentCreationDataModelProvider.COMPONENT_DEPLOY_NAME, MODULE_NAME);
- a.setBooleanProperty(EjbComponentCreationDataModelProvider.CREATE_CLIENT, false);
- a.setProperty(EjbComponentCreationDataModelProvider.PROJECT_NAME, PROJECT_NAME);
- a.getDefaultOperation().execute(new NullProgressMonitor(),null);
-
- return a.getDefaultOperation();
- }
-
- /**
- * @throws CoreException
- * @throws MalformedURLException
- * @throws IOException
- * @throws JavaException
- */
- protected void createTestJ2EEProject() throws CoreException, MalformedURLException, IOException {
- this.testProject = new TestProject();
- this.testProject.setSourceFolder(testProject.createSourceFolder());
- }
-
-}
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 a9ed930..0000000
--- a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/common/EjbModuleCreationTest.java
+++ /dev/null
@@ -1,59 +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.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.EnterpriseBeanClassDataModel;
-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.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-
-/**
- * @author naci
- *
- */
-public class EjbModuleCreationTest extends AnnotationTest {
-
- public void testEjbModuleCreation() throws Exception
- {
- this.createEjbModuleAndProject();
- AnnotationPreferenceStore.setProperty(AnnotationPreferenceStore.ANNOTATIONPROVIDER,XDOCLET);
- XDocletPreferenceStore.setPropertyActive(XDocletPreferenceStore.XDOCLETBUILDERACTIVE,true);
- XDocletPreferenceStore.setProperty(XDocletPreferenceStore.XDOCLETVERSION, TestSettings.xdocletversion);
- XDocletPreferenceStore.setProperty(XDocletPreferenceStore.XDOCLETHOME,TestSettings.xdocletlocation);
- EnterpriseBeanClassDataModel commonDataModel = createDefaultSessionModel();
- AddSessionBeanOperation sessionBeanOperation = new AddSessionBeanOperation(commonDataModel);
- sessionBeanOperation.doRun(new NullProgressMonitor());
- IProject project = null ; //Project.getProject(PROJECT_NAME);
- IFile bean = project.getFile(new Path("/zoo/ejbModule/com/farm/CowBean.java"));
- StructureEdit moduleCore = null;
-
- try {
- IVirtualResource[] vResources = ComponentCore.createResources(bean);
- System.out.print(vResources[0].getComponent());
- if( vResources.length == 0)
- System.out.print("Cannot find bean");
-
- } finally {
- if (moduleCore!=null)
- moduleCore.dispose();
- }
-
- XDocletAntProjectBuilder antProjectBuilder = XDocletAntProjectBuilder.Factory.newInstance(bean);
- antProjectBuilder.buildUsingAnt(bean,new NullProgressMonitor());
- }
-
- public void testSessionBeanCreation()
- {
-
- }
-
-}
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 5ba481b..0000000
--- a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/common/EnterpriseBeanModelTest.java
+++ /dev/null
@@ -1,43 +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.SessionBeanDataModel;
-
-/**
- * @author naci
- *
- */
-public class EnterpriseBeanModelTest extends AnnotationTest {
-
-
- public void testSessionBeanDataModel() throws Exception
- {
- createEjbModuleAndProject();
-
- SessionBeanDataModel dataModel = (SessionBeanDataModel)createDefaultSessionModel();
-
- assertNotNull(dataModel);
-
- assertEquals(IStatus.OK , dataModel.validateDataModel().getCode() );
-
- assertEquals(PROJECT_NAME,dataModel.getStringProperty(SessionBeanDataModel.PROJECT_NAME));
-
- assertEquals(MODULE_NAME,dataModel.getStringProperty(SessionBeanDataModel.MODULE_NAME));
-
- assertEquals(BEAN_CLASS, dataModel.getSimpleClassName());
- assertEquals(1, dataModel.getEJBInterfaces().size());
- assertEquals("javax.ejb.SessionBean", dataModel.getEJBInterfaces().get(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/TestProject.java b/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/common/TestProject.java
deleted file mode 100644
index 848f65f..0000000
--- a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/common/TestProject.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/**
- * <copyright>
- ******************************************************************************
- * 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/>.
- ****************************************************************************
- *</copyright>
- *
- * $Id$
- */
-
-
-package org.eclipse.jst.j2ee.ejb.generation.tests.common;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.IClasspathEntry;
-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.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.core.search.SearchPattern;
-import org.eclipse.jdt.core.search.TypeNameRequestor;
-import org.eclipse.jdt.launching.JavaRuntime;
-
-
-public class TestProject {
- public IProject project;
- public IJavaProject javaProject;
- private IPackageFragmentRoot sourceFolder;
- public TestProject() throws CoreException {
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- project = root.getProject("Project-1");
- project.create(null);
- project.open(null);
- javaProject = JavaCore.create(project);
- IFolder binFolder = createBinFolder();
- setJavaNature();
- javaProject.setRawClasspath(new IClasspathEntry[0], null);
- createOutputFolder(binFolder);
- addSystemLibraries();
- }
- public IProject getProject() {
- return project;
- }
- public IJavaProject getJavaProject() {
- return javaProject;
- }
- public void addJar(String plugin, String jar) throws MalformedURLException,
- IOException, JavaModelException {
- Path result = findFileInPlugin(plugin, jar);
- IClasspathEntry[] oldEntries = javaProject.getRawClasspath();
- IClasspathEntry[] newEntries = new IClasspathEntry[oldEntries.length + 1];
- System.arraycopy(oldEntries, 0, newEntries, 0, oldEntries.length);
- newEntries[oldEntries.length] = JavaCore.newLibraryEntry(result, null,
- null);
- javaProject.setRawClasspath(newEntries, null);
- }
- public IPackageFragment createPackage(String name) throws CoreException {
- if (sourceFolder == null)
- sourceFolder = createSourceFolder();
- return sourceFolder.createPackageFragment(name, false, null);
- }
- public IType createType(IPackageFragment pack, String cuName, String source)
- throws JavaModelException {
- StringBuffer buf = new StringBuffer();
- buf.append("package " + pack.getElementName() + ";\n");
- buf.append("\n");
- buf.append(source);
- ICompilationUnit cu = pack.createCompilationUnit(cuName,
- buf.toString(), false, null);
- return cu.getTypes()[0];
- }
- public void dispose() throws CoreException {
- waitForIndexer();
- project.delete(true, true, null);
- }
- private IFolder createBinFolder() throws CoreException {
- IFolder binFolder = project.getFolder("bin");
- binFolder.create(false, true, null);
- return binFolder;
- }
- private void setJavaNature() throws CoreException {
- IProjectDescription description = project.getDescription();
- description.setNatureIds(new String[]{JavaCore.NATURE_ID});
- project.setDescription(description, null);
- }
- private void createOutputFolder(IFolder binFolder)
- throws JavaModelException {
- IPath outputLocation = binFolder.getFullPath();
- javaProject.setOutputLocation(outputLocation, null);
- }
- public IPackageFragmentRoot createSourceFolder() throws CoreException {
- IFolder folder = project.getFolder("src");
- folder.create(false, true, null);
- IPackageFragmentRoot root = javaProject.getPackageFragmentRoot(folder);
- IClasspathEntry[] oldEntries = javaProject.getRawClasspath();
- IClasspathEntry[] newEntries = new IClasspathEntry[oldEntries.length + 1];
- System.arraycopy(oldEntries, 0, newEntries, 0, oldEntries.length);
- newEntries[oldEntries.length] = JavaCore.newSourceEntry(root.getPath());
- javaProject.setRawClasspath(newEntries, null);
- return root;
- }
- private void addSystemLibraries() throws JavaModelException {
- IClasspathEntry[] oldEntries = javaProject.getRawClasspath();
- IClasspathEntry[] newEntries = new IClasspathEntry[oldEntries.length + 1];
- System.arraycopy(oldEntries, 0, newEntries, 0, oldEntries.length);
- newEntries[oldEntries.length] = JavaRuntime.getDefaultJREContainerEntry();
- javaProject.setRawClasspath(newEntries, null);
- }
- private Path findFileInPlugin(String plugin, String file)
- throws MalformedURLException, IOException {
-
- URL jarURL = Platform.getBundle(plugin).getEntry(file);
- URL localJarURL = Platform.asLocalURL(jarURL);
- return new Path(localJarURL.getPath());
- }
- private void waitForIndexer() throws JavaModelException {
-
- int matchMode = SearchPattern.R_EXACT_MATCH;
- int matchRule = SearchPattern.R_CASE_SENSITIVE;
- new SearchEngine().searchAllTypeNames(
- null,
- null,
- matchRule,
- IJavaSearchConstants.TYPE,
- SearchEngine.createJavaSearchScope(new IJavaElement[0], false),
- new TypeNameRequestor() {
- public void acceptType(int modifiers, char[] packageName, char[] simpleTypeName, char[][] enclosingTypeNames, String path) {}
- },
- IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH,
- null);
- }
- /**
- * @return Returns the sourceFolder.
- */
- public IPackageFragmentRoot getSourceFolder() {
- return sourceFolder;
- }
- /**
- * @param sourceFolder The sourceFolder to set.
- */
- public void setSourceFolder(IPackageFragmentRoot sourceFolder) {
- this.sourceFolder = sourceFolder;
- }
-}
\ 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 e8ea6e7..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.jonas414";
- 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.3";
-
-
-}
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
