This commit was manufactured by cvs2svn to create tag 'v20050407'.
diff --git a/plugins/org.eclipse.jst.ejb.ui/.classpath b/plugins/org.eclipse.jst.ejb.ui/.classpath
deleted file mode 100644
index bea9f3d..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.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <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 b87cedb..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-temp.folder
-build.xml
-ejb_ui.jar
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/build.properties b/plugins/org.eclipse.jst.ejb.ui/build.properties
deleted file mode 100644
index d0d7ade..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/build.properties
+++ /dev/null
@@ -1,19 +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,\
- ejb_ui.jar
-src.includes = plugin.xml,\
- plugin.properties
-
-source.ejb_ui.jar = ejb_ui/,\
- property_files/
-output.ejb_ui.jar = 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 d7d3dae..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/actions/ExportEJBAction.java
+++ /dev/null
@@ -1,56 +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.wizard.WizardDialog;
-import org.eclipse.jst.ejb.ui.internal.wizard.EJBModuleExportWizard;
-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 = J2EEUIPlugin.getDefault().getDescriptor().getResourceString("%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) {
- EJBModuleExportWizard wizard = new EJBModuleExportWizard();
- 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 e559bd3..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.EJBModuleImportWizard;
-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) {
-
- EJBModuleImportWizard wizard = new EJBModuleImportWizard();
-
- 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/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/EJBAnnotationBeanDecorator.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/util/EJBAnnotationBeanDecorator.java
deleted file mode 100644
index 3fe136b..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/util/EJBAnnotationBeanDecorator.java
+++ /dev/null
@@ -1,131 +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 Aug 18, 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.util;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IDecoration;
-import org.eclipse.jface.viewers.ILightweightLabelDecorator;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jst.common.internal.annotations.controller.AnnotationsController;
-import org.eclipse.jst.common.internal.annotations.controller.AnnotationsControllerHelper;
-import org.eclipse.jst.common.internal.annotations.controller.AnnotationsControllerManager;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.internal.ejb.provider.BeanClassProviderHelper;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @author Administrator
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public class EJBAnnotationBeanDecorator extends LabelProvider implements ILightweightLabelDecorator {
- protected static final String ANNOTATIOM_IMAGE_DESC_STRING = "annotation_bean_overlay"; //$NON-NLS-1$
- protected static final String ANNOTATIOM_DISABLED_IMAGE_DESC_STRING = "dis_annotation_bean_overlay"; //$NON-NLS-1$
- private static final ImageDescriptor ANNOTATION_IMG_DESC = getImageDescriptor(ANNOTATIOM_IMAGE_DESC_STRING);
- private static final ImageDescriptor ANNOTATION_DISABLED_IMG_DESC = getImageDescriptor(ANNOTATIOM_DISABLED_IMAGE_DESC_STRING);
-
- public EJBAnnotationBeanDecorator() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ILightweightLabelDecorator#decorate(java.lang.Object,
- * org.eclipse.jface.viewers.IDecoration)
- */
-
- private boolean isAnnotatedSupported(EObject target) {
- boolean bAnnotationSupported = false;
- if (AnnotationsControllerHelper.INSTANCE.isAnnotated(target)) {
- bAnnotationSupported = true;
- }
- return bAnnotationSupported;
- }
-
- private AnnotationsController getControllerForProject(IProject targetProject) {
- AnnotationsController controller = AnnotationsControllerManager.INSTANCE.getAnnotationsController(targetProject);
- return controller;
- }
-
- public void decorate(Object element, IDecoration decoration) {
- EnterpriseBean bean = null;
- if (element instanceof BeanClassProviderHelper) {
- BeanClassProviderHelper beanClassHelper = (BeanClassProviderHelper) element;
- bean = beanClassHelper.getEjb();
- } else if (element instanceof EnterpriseBean) {
- bean = (EnterpriseBean) element;
- }
- if (bean == null)
- return;
- if (isAnnotatedSupported(bean)) {
- if (isAnnotationEnabled(bean)) {
- if (ANNOTATION_IMG_DESC != null)
- decoration.addOverlay(ANNOTATION_IMG_DESC);
- } else {
- if (ANNOTATION_DISABLED_IMG_DESC != null)
- decoration.addOverlay(ANNOTATION_DISABLED_IMG_DESC);
- }
- }
- }
-
- /**
- * @param bean
- * @return
- */
- private boolean isAnnotationEnabled(EnterpriseBean bean) {
- IFile annotatedSource = null;
- /* short circuit if possible */
- if (AnnotationsControllerManager.INSTANCE.isAnyAnnotationsSupported()) {
-
- IProject targetProject = ProjectUtilities.getProject(bean);
- AnnotationsController controller = getControllerForProject(targetProject);
-
- if (controller != null) {
- annotatedSource = controller.getEnabledAnnotationFile(bean);
- }
- }
-
- return (annotatedSource != null) ? true : false;
-
-
- }
-
- public Image decorateImage(Image image, Object element) {
- return image;
- }
-
- /**
- * @see ILabelDecorator#decorateText(String, Object)
- */
- public String decorateText(String text, Object element) {
- return text;
- }
-
- protected static ImageDescriptor getImageDescriptor(String imageFileName) {
- if (imageFileName != null)
- return J2EEUIPlugin.getDefault().getImageDescriptor(imageFileName);
- 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/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 71ef3e3..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBClientComponentCreationWizard.java
+++ /dev/null
@@ -1,75 +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.EJBClientComponentCreationOperation;
-import org.eclipse.jst.j2ee.internal.ejb.archiveoperations.EJBClientComponentDataModel;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel;
-import org.eclipse.wst.common.frameworks.internal.ui.WTPWizard;
-
-public class EJBClientComponentCreationWizard extends WTPWizard {
- private static final String PAGE_ONE = "pageOne"; //$NON-NLS-1$
-
- /**
- * @param model
- */
- public EJBClientComponentCreationWizard(WTPOperationDataModel 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((EJBClientComponentDataModel) model, PAGE_ONE));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizard#createDefaultModel()
- */
- protected WTPOperationDataModel createDefaultModel() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizard#runForked()
- */
- protected boolean runForked() {
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizard#createOperation()
- */
- protected WTPOperation createBaseOperation() {
- return new EJBClientComponentCreationOperation((EJBClientComponentDataModel) model);
- }
-}
\ 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 d381ba3..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.jem.util.logger.proxy.Logger;
-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.modulecore.util.EJBArtifactEdit;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.ejb.archiveoperations.EJBClientComponentDataModel;
-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.StructureEdit;
-import org.eclipse.wst.common.componentcore.UnresolveableURIException;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel;
-import org.eclipse.wst.common.frameworks.internal.ui.WTPWizardPage;
-
-public class EJBClientComponentCreationWizardPage extends WTPWizardPage {
- 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(EJBClientComponentDataModel 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(WTPOperationDataModel 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, EJBClientComponentDataModel.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, EJBClientComponentDataModel.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, (EJBClientComponentDataModel) model);
- }
-
- 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) {
- edit = EJBArtifactEdit.getEJBArtifactEditForRead(module);
- if (edit != null && edit.hasEJBClientJARProject(StructureEdit.getContainingProject(module)))
- 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[]{EJBClientComponentDataModel.EJB_COMPONENT_NAME, EJBClientComponentDataModel.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 77a157d..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBComponentCreationWizard.java
+++ /dev/null
@@ -1,199 +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.application.internal.operations.J2EEComponentCreationDataModel;
-import org.eclipse.jst.j2ee.internal.ejb.archiveoperations.EjbComponentCreationDataModel;
-import org.eclipse.jst.j2ee.internal.ejb.archiveoperations.EjbComponentCreationOperation;
-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.internal.operations.WTPOperation;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel;
-
-/**
- * <p>
- * Wizard used to create J2EE Enterprise Java Bean
- * (EJB) module structures in Eclipse Projects.
- * </p>
- */
-public final class EJBComponentCreationWizard extends J2EEComponentCreationWizard {
-
- /**
- * <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(EjbComponentCreationDataModel model) {
- super(model);
- }
-
- /**
- * {@inheritDoc}
- *
- * <p>
- * Overridden to return an {@see EJBProjectCreationDataModel} and defaults
- * the value of {@link J2EEModuleCreationDataModelOld#ADD_TO_EAR} to <b>true</b>
- * </p>
- *
- * @return Returns the specific operation data model for the creation of J2EE EJB modules
- */
- protected final WTPOperationDataModel createDefaultModel() {
- EjbComponentCreationDataModel aModel = new EjbComponentCreationDataModel();
- aModel.setBooleanProperty(J2EEComponentCreationDataModel.ADD_TO_EAR, true);
- return aModel;
- }
-
- /**
- * {@inheritDoc}
- *
- * <p>
- * Overridden to return an {@link EJBProjectCreationOperation}.
- * </p>
- *
- * @return Returns the specific operation for the creation of J2EE EJB modules
- */
- protected final WTPOperation createBaseOperation() {
- return new EjbComponentCreationOperation(getSpecificDataModel());
- }
-
- /**
- * {@inheritDoc}
- *
- * <p>
- * Sets up the dialog window title and default page image.
- * </p>
- *
- * @see J2EEArtifactCreationWizard#doInit()
- */
- protected void doInit() {
- setWindowTitle(EJBUIMessages.getResourceString(EJBUIMessages.EJB_PROJECT_WIZ_TITLE));
- setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EJB_PROJECT_WIZARD_BANNER));
-
- }
-
- /**
- * {@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(getSpecificDataModel(), MAIN_PG));
- clientPage = new EJBClientComponentCreationWizardPage(getSpecificDataModel().getNestedEJBClientComponentDataModel(), 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 (!getSpecificDataModel().getBooleanProperty(EjbComponentCreationDataModel.CREATE_CLIENT)) {
- clientPage.setPageComplete(true);
- }
- return super.canFinish();
- }
-
- /**
- * {@inheritDoc}
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.extensions.ExtendableWizard#getWizardID()
- */
- public String getWizardID() {
- return WIZARD_ID;
- }
-
- /**
- * @return true if the client page should be skipped (based on the value of {@see EJBProjectCreationDataModel#CREATE_CLIENT}.
- */
- protected final boolean shouldSkipClientPage() {
- return !getSpecificDataModel().getBooleanProperty(EjbComponentCreationDataModel.CREATE_CLIENT);
- }
-
- private EjbComponentCreationDataModel getSpecificDataModel() {
- return (EjbComponentCreationDataModel) getModel();
- }
-}
\ 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 fa5ff33..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBComponentCreationWizardPage.java
+++ /dev/null
@@ -1,149 +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.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.ejb.archiveoperations.EjbComponentCreationDataModel;
-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.AnnotationsStandaloneGroup;
-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;
-
-public class EJBComponentCreationWizardPage extends J2EEComponentCreationWizardPage {
- protected Button addClient;
- protected AnnotationsStandaloneGroup annotationsGroup;
-
- // private Button addDefaultBean;
-
- /**
- * @param model
- * @param pageName
- */
- public EJBComponentCreationWizardPage(EjbComponentCreationDataModel 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);
-
- 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 AnnotationsStandaloneGroup(parent, getJ2EEModuleCreationDataModel(), false);
- }
-
- /**
- * @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, EjbComponentCreationDataModel.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] = EjbComponentCreationDataModel.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(EjbComponentCreationDataModel.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(EjbComponentCreationDataModel.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/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 848a9a1..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBExportPage.java
+++ /dev/null
@@ -1,90 +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.application.internal.operations.J2EEModuleExportDataModel;
-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.project.IEJBNatureConstants;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleExportPage;
-
-
-/**
- * @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(J2EEModuleExportDataModel 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 getProjectLabel() {
- 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;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.ui.wizard.J2EEExportPage#getNatureID()
- */
- protected String getNatureID() {
-
- return IEJBNatureConstants.NATURE_ID;
- }
-
- protected String getInfopopID() {
- return IJ2EEUIContextIds.EXPORT_EJB_WIZARD_P1;
- }
-
-}
\ 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/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBImportPage.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBImportPage.java
deleted file mode 100644
index 6a8b6a5..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBImportPage.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * 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.jst.ejb.ui.internal.util.EJBUIMessages;
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentCreationDataModel;
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleImportDataModel;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.ejb.archiveoperations.EjbComponentCreationDataModel;
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.EJBModuleImportDataModel;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.project.IEJBNatureConstants;
-import org.eclipse.jst.j2ee.internal.wizard.AnnotationsStandaloneGroup;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleImportPage;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.frameworks.internal.ui.WTPWizard;
-
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class EJBImportPage extends J2EEModuleImportPage {
- /**
- * @param model
- * @param pageName
- */
- public EJBImportPage(J2EEModuleImportDataModel 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 IEJBNatureConstants.NATURE_ID;
- }
-
- protected String getFileImportLabel() {
- return EJBUIMessages.getResourceString(EJBUIMessages.EJB_JAR_FILE_LBL);
- }
-
- protected String[] getFilterExpression() {
- return new String[]{"*.jar"}; //$NON-NLS-1$
- }
-
- protected J2EEComponentCreationDataModel getNewProjectCreationDataModel() {
- return getEJBDataModel().getJ2eeArtifactCreationDataModel();
- }
-
- protected WTPWizard getNewProjectWizard(EjbComponentCreationDataModel aModel) {
- return new EJBComponentCreationWizard(aModel);
- }
-
- private EJBModuleImportDataModel getEJBDataModel() {
- return (EJBModuleImportDataModel) model;
- }
-
- 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/EJBModuleExportWizard.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBModuleExportWizard.java
deleted file mode 100644
index 1c320d7..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBModuleExportWizard.java
+++ /dev/null
@@ -1,106 +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.archiveoperations.EJBModuleExportOperation;
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.EJBModuleExportDataModel;
-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.internal.operations.WTPOperation;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel;
-
-/**
- * <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 EJBModuleExportWizard 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 EJBModuleExportWizard() {
- 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 EJBModuleExportWizard(EJBModuleExportDataModel model) {
- super(model);
- }
-
- /**
- * {@inheritDoc}
- *
- * <p>
- * Overridden to return an {@link EJBModuleExportDataModel}.
- * </p>
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizard#createDefaultModel()
- */
- protected WTPOperationDataModel createDefaultModel() {
- return new EJBModuleExportDataModel();
- }
-
- /**
- * {@inheritDoc}
- *
- * <p>
- * Returns an {@link EJBModuleExportOperation} using the model either
- * supplied in the constructor or created from {@see #createDefaultModel()}.
- * </p>
- * @return Returns the operation to be executed when the Wizard completes.
- */
- protected WTPOperation createBaseOperation() {
- return new EJBModuleExportOperation(getSpecificModel());
- }
-
- /**
- * <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(getSpecificModel(), 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));
- }
-
- private EJBModuleExportDataModel getSpecificModel() {
- return (EJBModuleExportDataModel) getModel();
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBModuleImportWizard.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBModuleImportWizard.java
deleted file mode 100644
index 6091eca..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBModuleImportWizard.java
+++ /dev/null
@@ -1,107 +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.application.internal.operations.J2EEModuleImportDataModel;
-import org.eclipse.jst.j2ee.internal.ejb.archiveoperations.EJBModuleImportOperation;
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.EJBModuleImportDataModel;
-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.J2EEModuleImportWizard;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel;
-
-/**
- * <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 EJBModuleImportWizard extends J2EEModuleImportWizard {
-
- /**
- * <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 EJBModuleImportWizard() {
- 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 EJBModuleImportWizard(EJBModuleImportDataModel model) {
- super(model);
- }
-
- /**
- * <p>
- * Overridden to return an {@link EJBModuleImportWizard} and defaults
- * the value of {@link J2EEModuleImportDataModel#ADD_TO_EAR} to <b>true</b>.
- * </p>
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizard#createDefaultModel()
- */
- protected WTPOperationDataModel createDefaultModel() {
- EJBModuleImportDataModel aModel = new EJBModuleImportDataModel();
- aModel.setBooleanProperty(J2EEModuleImportDataModel.ADD_TO_EAR, true);
- return aModel;
- }
-
- /**
- * <p>
- * Adds an {@link EJBImportPage} as the main wizard page ({@link #MAIN_PG}).
- * </p>
- */
- public void doAddPages() {
- addPage(new EJBImportPage((J2EEModuleImportDataModel)getModel(), 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 WTPOperation getImportOperation() {
- return new EJBModuleImportOperation(getSpecificDataModel());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.ui.wizard.J2EEModuleImportWizard#getModuleValidatorStrings()
- */
- protected String[] getModuleValidatorStrings() {
- return new String[]{"org.eclipse.jst.j2ee.model.internal.validation.EJBValidator"}; //$NON-NLS-1$
- }
-
- private EJBModuleImportDataModel getSpecificDataModel() {
- return (EJBModuleImportDataModel)getModel();
- }
-
-}
\ 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 97e72b7..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_=J2EE EJB Module
-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 module
-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 fd12c57..0000000
--- a/plugins/org.eclipse.jst.ejb.ui/plugin.xml
+++ /dev/null
@@ -1,325 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
- id="org.eclipse.jst.ejb.ui"
- name="WTP EJB UI Plug-in"
- version="1.0.0"
- class="org.eclipse.jst.ejb.ui.internal.plugin.EJBUIPlugin"
- provider-name="%providerName">
- <runtime>
- <library name="ejb_ui.jar">
- <export name="*"/>
- </library>
- </runtime>
- <requires>
- <import plugin="org.eclipse.ui.views"/>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.wst.common.frameworks.ui"/>
- <import plugin="org.eclipse.jst.j2ee.ejb"/>
- <import plugin="org.eclipse.jst.j2ee.jca"/>
- <import plugin="org.eclipse.jst.j2ee.web"/>
- <import plugin="org.eclipse.jdt.ui"/>
- <import plugin="org.eclipse.jst.j2ee"/>
- <import plugin="org.eclipse.jst.j2ee.core"/>
- <import plugin="org.eclipse.wst.common.emfworkbench.integration"/>
- <import plugin="org.eclipse.ui.workbench"/>
- <import plugin="org.eclipse.jem.workbench"/>
- <import plugin="org.eclipse.jem"/>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.wst.common.frameworks"/>
- <import plugin="org.eclipse.jdt.core"/>
- <import plugin="org.eclipse.wst.server.ui"/>
- <import plugin="org.eclipse.wst.server.core"/>
- <import plugin="org.eclipse.wst.common.emf"/>
- <import plugin="org.eclipse.emf.ecore.xmi"/>
- <import plugin="org.eclipse.wst.common.migration"/>
- <import plugin="org.eclipse.jst.j2ee.ui" export="true"/>
- <import plugin="org.eclipse.jem.workbench"/>
- <import plugin="org.eclipse.jst.common.frameworks"/>
- <import plugin="org.eclipse.jst.common.annotations.controller"/>
- <import plugin="org.eclipse.wst.common.navigator.workbench"/>
- <import plugin="org.eclipse.wst.common.modulecore"/>
- </requires>
-
-<!-- ====================================================== -->
-<!-- -->
-<!-- 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"
- 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.EJBModuleExportWizard"
- 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"
- 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"
- 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"
- objectClass="org.eclipse.jst.j2ee.internal.ejb.provider.BeanClassProviderHelper"
- adaptable="true"
- label="%beanClassAnnotationDecorator"
- class="org.eclipse.jst.ejb.ui.internal.util.EJBAnnotationBeanDecorator"
- state="true"
- location="TOP_LEFT"
- id="org.eclipse.jst.ejb.ui.internal.util.EJBAnnotationBeanDecorator_beanClass">
- <description>
- %beanClassAnnotationDecorator.description
- </description>
- </decorator>
- <decorator
- lightweight="true"
- objectClass="org.eclipse.jst.j2ee.ejb.EnterpriseBean"
- adaptable="true"
- label="%ejbAnnotationDecorator"
- class="org.eclipse.jst.ejb.ui.internal.util.EJBAnnotationBeanDecorator"
- state="true"
- location="TOP_LEFT"
- id="org.eclipse.jst.ejb.ui.internal.util.EJBAnnotationBeanDecorator">
- <description>
- %ejbAnnotationDecorator.description
- </description>
- </decorator>
- </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.EJBModuleImportWizard"
- id="org.eclipse.jst.ejb.ui.EJBModuleImportWizard">
- <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.jdt.core.javanature">
- </objectState>
- </or>
- </and>
- <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 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 8ec11ec..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 Module
-2=EJB version:
-3=EJB Module
-4=Create an EJB module 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 6542c29..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/.classpath
+++ /dev/null
@@ -1,8 +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="src" path="property_files"/>
- <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 525afb2..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-temp.folder
-*.jar
-build.xml
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/build.properties b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/build.properties
deleted file mode 100644
index 2c9b9de..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.ejbAnnotationModel.jar = src/ ,\
- property_files/
-output.ejbAnnotationModel.jar = bin/
-bin.includes = plugin.xml,\
- ejbAnnotationModel.jar
-src.includes = property_files/
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 2e4942d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/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.annotation.model"
- name="EJB Annotation Model Plug-in"
- version="1.0.0"
- provider-name="Eteration"
- class="org.eclipse.jst.j2ee.ejb.annotation.internal.model.ModelPlugin">
-
- <runtime>
- <library name="ejbAnnotationModel.jar">
- <export name="*"/>
- </library>
- </runtime>
-
- <requires>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.core.resources"/>
-
- <import plugin="org.eclipse.jdt.ui"/>
- <import plugin="org.eclipse.jdt.core"/>
-
- <import plugin="org.eclipse.wst.common.frameworks"/>
- <import plugin="org.eclipse.wst.common.frameworks.ui"/>
-
- <import plugin="org.eclipse.jst.j2ee"/>
- <import plugin="org.eclipse.jst.j2ee.core"/>
- <import plugin="org.eclipse.jst.j2ee.ejb"/>
- <import plugin="org.eclipse.jst.j2ee.ejb.annotations.emitter"/>
-
- <import plugin="org.eclipse.emf.ecore.xmi"/>
- <import plugin="org.eclipse.wst.common.emfworkbench.integration"/>
- <import plugin="org.eclipse.jem"/>
- <import plugin="org.eclipse.jem.workbench"/>
- <import plugin="org.eclipse.wst.common.modulecore"/>
-
- </requires>
-
-</plugin>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/property_files/web_ui.properties b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/property_files/web_ui.properties
deleted file mode 100644
index c2d0618..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/property_files/web_ui.properties
+++ /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
-###############################################################################
-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_SESSION_EJB_WIZARD_WINDOW_TITLE=Create Session Bean
-ADD_SESSION_EJB_WIZARD_PAGE_TITLE=Session Bean
-ADD_SESSION_EJB_WIZARD_PAGE_DESC=Create a Session Bean
-
-ADD_MESSAGE_EJB_WIZARD_WINDOW_TITLE=Create Message Driven Bean
-ADD_MESSAGE_EJB_WIZARD_PAGE_TITLE=Message Driven Bean
-ADD_MESSAGE_EJB_WIZARD_PAGE_DESC=Create a Message Driven Bean
-
-ADD_ENTITY_EJB_WIZARD_WINDOW_TITLE=Create Entity Bean
-ADD_ENTITY_EJB_WIZARD_PAGE_TITLE=Enterprise Bean
-ADD_ENTITY_EJB_WIZARD_PAGE_DESC=Create an Entity Bean
-
-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_NAME_ENDS_WITH_BEAN= You must not use Bean as a suffix to the EJB class 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
-
-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.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 41eed9f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/messages/IEJBAnnotationConstants.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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_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$
-
- // AddEjbWizard
- public final static String ADD_SESSION_EJB_WIZARD_WINDOW_TITLE = EJBAnnotationMessages.getResourceString("ADD_SESSION_EJB_WIZARD_WINDOW_TITLE"); //$NON-NLS-1$
- public final static String ADD_SESSION_EJB_WIZARD_PAGE_TITLE = EJBAnnotationMessages.getResourceString("ADD_SESSION_EJB_WIZARD_PAGE_TITLE"); //$NON-NLS-1$
- public static final String ADD_SESSION_EJB_WIZARD_PAGE_DESC = EJBAnnotationMessages.getResourceString("ADD_SESSION_EJB_WIZARD_PAGE_DESC"); //$NON-NLS-1$
-
- public final static String ADD_MESSAGE_EJB_WIZARD_WINDOW_TITLE = EJBAnnotationMessages.getResourceString("ADD_MESSAGE_EJB_WIZARD_WINDOW_TITLE"); //$NON-NLS-1$
- public final static String ADD_MESSAGE_EJB_WIZARD_PAGE_TITLE = EJBAnnotationMessages.getResourceString("ADD_MESSAGE_EJB_WIZARD_PAGE_TITLE"); //$NON-NLS-1$
- public static final String ADD_MESSAGE_EJB_WIZARD_PAGE_DESC = EJBAnnotationMessages.getResourceString("ADD_MESSAGE_EJB_WIZARD_PAGE_DESC"); //$NON-NLS-1$
-
- public final static String ADD_ENTITY_EJB_WIZARD_WINDOW_TITLE = EJBAnnotationMessages.getResourceString("ADD_ENTITY_EJB_WIZARD_WINDOW_TITLE"); //$NON-NLS-1$
- public final static String ADD_ENTITY_EJB_WIZARD_PAGE_TITLE = EJBAnnotationMessages.getResourceString("ADD_ENTITY_EJB_WIZARD_PAGE_TITLE"); //$NON-NLS-1$
- public static final String ADD_ENTITY_EJB_WIZARD_PAGE_DESC = EJBAnnotationMessages.getResourceString("ADD_ENTITY_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/BeanFactory.java b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/BeanFactory.java
deleted file mode 100644
index 6bde722..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/BeanFactory.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.jst.j2ee.ejb.annotation.internal.model;
-
-import org.eclipse.jst.j2ee.ejb.MessageDriven;
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.emitter.model.IMessageDrivenBeanDelegate;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.emitter.model.ISessionBeanDelegate;
-
-
-public class BeanFactory {
-
- public static ISessionBeanDelegate getDelegate(Session session, SessionBeanDataModel beanDataModel)
- {
- SessionBeanDelegate beanDelegate = new SessionBeanDelegate();
- beanDelegate.setEjb(session);
- beanDelegate.setEnterpriseBeanDataModel(beanDataModel);
-
- return beanDelegate;
- }
-
- public static IMessageDrivenBeanDelegate getDelegate(MessageDriven mdb, MessageDrivenBeanDataModel beanDataModel)
- {
- MessageDrivenBeanDelegate beanDelegate = new MessageDrivenBeanDelegate();
- beanDelegate.setEjb(mdb);
- beanDelegate.setEnterpriseBeanDataModel(beanDataModel);
-
- return beanDelegate;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/EjbCommonDataModel.java b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/EjbCommonDataModel.java
deleted file mode 100644
index 5366368..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/EjbCommonDataModel.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.ejb.annotation.internal.model;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.messages.IEJBAnnotationConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EECommonMessages;
-import org.eclipse.jst.j2ee.internal.common.operations.J2EEModelModifierOperationDataModel;
-import org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModel;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-public abstract class EjbCommonDataModel extends
- J2EEModelModifierOperationDataModel {
-
- public static final String EJB_NAME = "EjbCommonDataModel.EJB_NAME"; //$NON-NLS-1$
-
- public static final String JNDI_NAME = "EjbCommonDataModel.JNDI_NAME"; //$NON-NLS-1$
-
- public static final String DISPLAY_NAME = "EjbCommonDataModel.DISPLAY_NAME"; //$NON-NLS-1$
-
- public static final String DESCRIPTION = "EjbCommonDataModel.DESCRIPTION"; //$NON-NLS-1$
-
- public static final String CLASS_NAME = "EjbCommonDataModel.CLASS_NAME"; //$NON-NLS-1$
-
- public static final String STATELESS = "EjbCommonDataModel.STATELESS";
-
- public static final String TRANSACTIONTYPE = "EjbCommonDataModel.TRANSACTIONTYPE";
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModel#getDefaultOperation()
- */
- public WTPOperation getDefaultOperation() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.internal.emfworkbench.operation.ModelModifierOperationDataModel#initValidBaseProperties()
- */
- protected void initValidBaseProperties() {
- super.initValidBaseProperties();
- addValidBaseProperty(EJB_NAME);
- addValidBaseProperty(DISPLAY_NAME);
- addValidBaseProperty(JNDI_NAME);
- addValidBaseProperty(DESCRIPTION);
- addValidBaseProperty(CLASS_NAME);
- addValidBaseProperty(STATELESS);
- addValidBaseProperty(TRANSACTIONTYPE);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModel#doValidateProperty(java.lang.String)
- */
- protected IStatus doValidateProperty(String propertyName) {
- if (propertyName.equals(EJB_NAME))
- return validateEJBName(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(STATELESS))
- return validateStateless(getStringProperty(propertyName));
- if (propertyName.equals(TRANSACTIONTYPE))
- return validateTransaction(getStringProperty(propertyName));
- return super.doValidateProperty(propertyName);
- }
-
- 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) {
- String msg = IEJBAnnotationConstants.ERR_STATELESS_VALUE;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- return WTPCommonPlugin.OK_STATUS;
- }
-
- 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) {
- String msg = IEJBAnnotationConstants.ERR_TRANSACTION_VALUE;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- return WTPCommonPlugin.OK_STATUS;
- }
-
- 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);
- }
-
- // check for duplicate
- EJBJar ejbJar = (EJBJar) getDeploymentDescriptorRoot();
- if (ejbJar != null) {
- 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);
- }
- }
- }
- }
-
- return WTPCommonPlugin.OK_STATUS;
- }
-
- protected IStatus validateClassName(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);
- }
- // check for duplicate
- EJBJar ejbJar = (EJBJar) getDeploymentDescriptorRoot();
- 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);
- }
- }
- }
-
- return WTPCommonPlugin.OK_STATUS;
- }
-
- protected Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(EJB_NAME) && getNestedModel("NewEJBJavaClassDataModel") != null) {
- String className = getNestedModel("NewEJBJavaClassDataModel").getStringProperty(NewJavaClassDataModel.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(DISPLAY_NAME)) {
- return getProperty(EJB_NAME);
- } else if (propertyName.equals(DESCRIPTION)) {
- return "A session bean named "+getStringProperty(EJB_NAME);
- }
- return super.getDefaultProperty(propertyName);
- }
-
- protected boolean doSetProperty(String propertyName, Object propertyValue) {
- boolean result = super.doSetProperty(propertyName, propertyValue);
- if (propertyName.equals(EJB_NAME)) {
- if (!isSet(JNDI_NAME))
- notifyDefaultChange(JNDI_NAME);
- else if (!isSet(DISPLAY_NAME))
- notifyDefaultChange(DISPLAY_NAME);
- if (!isSet(DESCRIPTION))
- notifyDefaultChange(DESCRIPTION);
- }
-
- return result;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/MessageDrivenBeanDataModel.java b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/MessageDrivenBeanDataModel.java
deleted file mode 100644
index a48f2a9..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/MessageDrivenBeanDataModel.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.jst.j2ee.ejb.annotation.internal.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.messages.IEJBAnnotationConstants;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.operations.AddMessageDrivenBeanOperation;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-
-public class MessageDrivenBeanDataModel extends EjbCommonDataModel implements 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_SUPERCLASS = "java.lang.Object"; //$NON-NLS-1$
- public final static String[] EJB_INTERFACES = {"javax.ejb.MessageDrivenBean" //$NON-NLS-1$
- , "javax.jms.MessageListener" //$NON-NLS-1$
- };
-
- private List interfaceList;
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModel#getDefaultOperation()
- */
- public WTPOperation getDefaultOperation() {
- return new AddMessageDrivenBeanOperation(this);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.internal.emfworkbench.operation.ModelModifierOperationDataModel#initValidBaseProperties()
- */
- protected void initValidBaseProperties() {
- super.initValidBaseProperties();
- addValidBaseProperty(DESTINATIONTYPE);
- addValidBaseProperty(DESTINATIONNAME);
- }
-
-
- protected Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(USE_ANNOTATIONS))
- return Boolean.FALSE;
- else if (propertyName.equals(DESTINATIONNAME))
- return getProperty(JNDI_NAME);
- return super.getDefaultProperty(propertyName);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModel#doValidateProperty(java.lang.String)
- */
- protected IStatus doValidateProperty(String propertyName) {
- if (propertyName.equals(DESTINATIONNAME))
- return validateJndiName(getStringProperty(propertyName));
- if (propertyName.equals(DESTINATIONTYPE))
- return validateDestinationType(getStringProperty(propertyName));
- return super.doValidateProperty(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) {
- String msg = IEJBAnnotationConstants.ERR_DESTINATIONTYPE_VALUE;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- return WTPCommonPlugin.OK_STATUS;
- }
-
-
- public String getEjbSuperclassName() {
- return EJB_SUPERCLASS;
- }
-
- public List getEJBInterfaces() {
- if (this.interfaceList == null) {
- this.interfaceList = new ArrayList();
- for (int i = 0; i < EJB_INTERFACES.length; i++) {
- this.interfaceList.add(EJB_INTERFACES[i]);
- }
- }
- return this.interfaceList;
- }
-
-
- protected Boolean basicIsEnabled(String propertyName) {
- if (USE_ANNOTATIONS.equals(propertyName)) {
- if (this.j2eeNature.getJ2EEVersion() < J2EEVersionConstants.VERSION_1_3) {
- if (getBooleanProperty(USE_ANNOTATIONS))
- setBooleanProperty(USE_ANNOTATIONS, false);
- return Boolean.FALSE;
- }
- return Boolean.TRUE;
- } else if (propertyName.equals(JNDI_NAME))
- notifyDefaultChange(DESTINATIONNAME);
- return super.basicIsEnabled(propertyName);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModel#doSetProperty(java.lang.String,
- * java.lang.Object)
- */
- protected boolean doSetProperty(String propertyName, Object propertyValue) {
- if (propertyName.equals(USE_ANNOTATIONS)) {
- if (((Boolean) propertyValue).booleanValue() && this.j2eeNature.getJ2EEVersion() < J2EEVersionConstants.VERSION_1_3)
- return true;
- notifyEnablementChange(USE_ANNOTATIONS);
- }
- return super.doSetProperty(propertyName, propertyValue);
- }
-}
\ 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 9a39e40..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/MessageDrivenBeanDelegate.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.MessageDriven;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.emitter.model.IMessageDrivenBeanDelegate;
-import org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModel;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel;
-
-
-
-public class MessageDrivenBeanDelegate implements IMessageDrivenBeanDelegate {
-
-
- private MessageDriven messageDriven;
- private MessageDrivenBeanDataModel messageDrivenBeanDataModel;
-
- public MessageDrivenBeanDelegate() {
- super();
- }
-
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.ejb.annotation.model.IEnterpriseBeanDelegate#getEnterrpriseBeanDataModel()
- */
- public EjbCommonDataModel getEnterpriseBeanDataModel() {
- return messageDrivenBeanDataModel;
- }
-
- public EnterpriseBean getEjb() {
- return messageDriven;
- }
- public void setEjb(EnterpriseBean messageDriven) {
- this.messageDriven = (MessageDriven)messageDriven;
- }
-
- public MessageDrivenBeanDataModel getMessageDrivenBeanDataModel() {
- return messageDrivenBeanDataModel;
- }
-
- public WTPOperationDataModel getDataModel() {
- return messageDrivenBeanDataModel;
- }
-
- public void setEnterpriseBeanDataModel(
- EjbCommonDataModel messageDrivenBeanDataModel) {
- this.messageDrivenBeanDataModel = (MessageDrivenBeanDataModel)messageDrivenBeanDataModel;
- }
-
- public String getJndiName() {
- return messageDrivenBeanDataModel.getStringProperty(MessageDrivenBeanDataModel.JNDI_NAME);
- }
-
- public String getEjbName() {
- return messageDrivenBeanDataModel.getStringProperty(MessageDrivenBeanDataModel.EJB_NAME);
- }
-
- public String getInterfaces() {
- NewJavaClassDataModel classDataModel = (NewJavaClassDataModel)messageDrivenBeanDataModel.getNestedModel("NewEJBJavaClassDataModel");
- List ints = (List)classDataModel.getProperty(NewJavaClassDataModel.INTERFACES);
- Iterator iterator = ints.iterator();
- String intStr = (iterator.hasNext()? (String)iterator.next() : "javax.ejb.MessageDrivenBean, javax.jms.MessageListener");
- while (iterator.hasNext()) {
- String intrfc = (String) iterator.next();
- intStr += ", " + intrfc ;
- }
-
- return intStr;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.ejb.annotation.model.ISessionBeanDelegate#getSimpleClassName()
- */
- public String getSimpleClassName() {
- NewJavaClassDataModel classDataModel = (NewJavaClassDataModel)messageDrivenBeanDataModel.getNestedModel("NewEJBJavaClassDataModel");
- return classDataModel.getStringProperty(NewJavaClassDataModel.CLASS_NAME);
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.ejb.annotation.model.ISessionBeanDelegate#getTransactionType()
- */
- public String getTransactionType() {
- return messageDriven.getTransactionType().getName();
- }
-
- public String getDisplayName() {
- return messageDrivenBeanDataModel.getStringProperty(MessageDrivenBeanDataModel.DISPLAY_NAME);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.ejb.annotation.model.ISessionBeanDelegate#getDescription()
- */
- public String getDescription() {
- return messageDrivenBeanDataModel.getStringProperty(MessageDrivenBeanDataModel.DESCRIPTION);
- }
-
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.ejb.annotations.internal.emitter.model.IMessageDrivenBeanDelegate#getDestinationType()
- */
- public String getDestinationType() {
- return messageDriven.getDestination().getType().getName();
- }
-
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.ejb.annotations.internal.emitter.model.IMessageDrivenBeanDelegate#getDestinationJndiName()
- */
- public String getDestinationJndiName() {
- return messageDriven.getMessageSelector();
- }
-
-}
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 31c0308..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/ModelPlugin.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.annotation.internal.model;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-
-public class ModelPlugin extends Plugin {
- //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/NewEJBJavaClassDataModel.java b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/NewEJBJavaClassDataModel.java
deleted file mode 100644
index c29f239..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/NewEJBJavaClassDataModel.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.jst.j2ee.ejb.annotation.internal.model;
-
-import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel;
-import org.eclipse.jst.j2ee.ejb.modulecore.util.EJBArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModel;
-
-public class NewEJBJavaClassDataModel extends NewJavaClassDataModel implements IAnnotationsDataModel {
-
- /**
- * Subclasses may extend this method to add their own specific data model properties as valid
- * base properties. This implementation adds the ejb specific properties to those added
- * by the NewJavaClassDataModel.
- * @see NewJavaClassDataModel#initValidBaseProperties()
- * @see org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel#initValidBaseProperties()
- */
- protected void initValidBaseProperties() {
- super.initValidBaseProperties();
- // Add ejb specific properties defined in this data model
- addValidBaseProperty(USE_ANNOTATIONS);
- }
-
- /**
- * 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?
- */
- protected Boolean basicIsEnabled(String propertyName) {
- // Annotations should only be enabled on a valid j2ee project of version 1.3 or higher
- if (USE_ANNOTATIONS.equals(propertyName)) {
- return Boolean.FALSE;
-// if (!isAnnotationsSupported())
-// return Boolean.FALSE;
-// return Boolean.TRUE;
- }
- // Otherwise return super implementation
- return super.basicIsEnabled(propertyName);
- }
-
- protected boolean isAnnotationsSupported() {
- if (getTargetProject()==null || getWorkbenchModule()==null) return true;
- EJBArtifactEdit ejbEdit = null;
- try {
- ejbEdit = EJBArtifactEdit.getEJBArtifactEditForRead(getWorkbenchModule());
- 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();
- }
- }
-
- protected boolean doSetProperty(String propertyName, Object propertyValue) {
- // TODO Auto-generated method stub
- boolean result = super.doSetProperty(propertyName, propertyValue);
- // After the property is set, if project changed, update the nature and the annotations enablement
- if (propertyName.equals(MODULE_NAME)) {
- notifyEnablementChange(USE_ANNOTATIONS);
- } else if (propertyName.equals(CLASS_NAME)) {
- EjbCommonDataModel parentModel = (EjbCommonDataModel) getNestingModels().next();
- if (!parentModel.isSet(EjbCommonDataModel.EJB_NAME))
- parentModel.notifyDefaultChange(EjbCommonDataModel.EJB_NAME);
- }
- return result;
- }
-
- protected Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(USE_ANNOTATIONS))
- return Boolean.TRUE;
- else if (propertyName.equals(CLASS_NAME))
- return "Bean";
- return super.getDefaultProperty(propertyName);
- }
-
-}
\ 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/SessionBeanDataModel.java b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/SessionBeanDataModel.java
deleted file mode 100644
index ae54a9a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/SessionBeanDataModel.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.internal.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.operations.AddSessionBeanOperation;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation;
-
-
-public class SessionBeanDataModel extends EjbCommonDataModel implements IAnnotationsDataModel {
- public final static String EJB_SUPERCLASS = "java.lang.Object"; //$NON-NLS-1$
- public final static String[] EJB_INTERFACES = {"javax.ejb.SessionBean" //$NON-NLS-1$
- };
-
- private List interfaceList;
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModel#getDefaultOperation()
- */
- public WTPOperation getDefaultOperation() {
- return new AddSessionBeanOperation(this);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.internal.emfworkbench.operation.ModelModifierOperationDataModel#initValidBaseProperties()
- */
- protected void initValidBaseProperties() {
- super.initValidBaseProperties();
- }
-
- protected Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(USE_ANNOTATIONS))
- return Boolean.FALSE;
- return super.getDefaultProperty(propertyName);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModel#doValidateProperty(java.lang.String)
- */
- protected IStatus doValidateProperty(String propertyName) {
- return super.doValidateProperty(propertyName);
- }
-
-
- public String getEjbSuperclassName() {
- return EJB_SUPERCLASS;
- }
-
- public List getEJBInterfaces() {
- if (this.interfaceList == null) {
- this.interfaceList = new ArrayList();
- for (int i = 0; i < EJB_INTERFACES.length; i++) {
- this.interfaceList.add(EJB_INTERFACES[i]);
- }
- }
- return this.interfaceList;
- }
-
-
- protected Boolean basicIsEnabled(String propertyName) {
- if (USE_ANNOTATIONS.equals(propertyName)) {
- if (this.j2eeNature.getJ2EEVersion() < J2EEVersionConstants.VERSION_1_3) {
- if (getBooleanProperty(USE_ANNOTATIONS))
- setBooleanProperty(USE_ANNOTATIONS, false);
- return Boolean.FALSE;
- }
- return Boolean.TRUE;
- }
- return super.basicIsEnabled(propertyName);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModel#doSetProperty(java.lang.String,
- * java.lang.Object)
- */
- protected boolean doSetProperty(String propertyName, Object propertyValue) {
- if (propertyName.equals(USE_ANNOTATIONS)) {
- if (((Boolean) propertyValue).booleanValue() && this.j2eeNature.getJ2EEVersion() < J2EEVersionConstants.VERSION_1_3)
- return true;
- notifyEnablementChange(USE_ANNOTATIONS);
- }
- return super.doSetProperty(propertyName, propertyValue);
- }
-}
\ 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 6e7e2ec..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/model/SessionBeanDelegate.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.jst.j2ee.ejb.annotation.internal.model;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.emitter.model.ISessionBeanDelegate;
-import org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModel;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel;
-
-
-
-public class SessionBeanDelegate implements ISessionBeanDelegate {
-
-
- private Session session;
- private SessionBeanDataModel sessionBeanDataModel;
-
- public SessionBeanDelegate() {
- super();
- }
-
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.ejb.annotation.model.IEnterpriseBeanDelegate#getEnterrpriseBeanDataModel()
- */
- public EjbCommonDataModel getEnterpriseBeanDataModel() {
- return sessionBeanDataModel;
- }
-
- public EnterpriseBean getEjb() {
- return session;
- }
- public void setEjb(EnterpriseBean session) {
- this.session = (Session)session;
- }
-
- public SessionBeanDataModel getSessionBeanDataModel() {
- return sessionBeanDataModel;
- }
-
- public WTPOperationDataModel getDataModel() {
- return sessionBeanDataModel;
- }
-
- public void setEnterpriseBeanDataModel(
- EjbCommonDataModel sessionBeanDataModel) {
- this.sessionBeanDataModel = (SessionBeanDataModel)sessionBeanDataModel;
- }
-
- public String getJndiName() {
- return sessionBeanDataModel.getStringProperty(SessionBeanDataModel.JNDI_NAME);
- }
-
- public String getEjbName() {
- return sessionBeanDataModel.getStringProperty(SessionBeanDataModel.EJB_NAME);
- }
-
- public String getInterfaces() {
- NewJavaClassDataModel classDataModel = (NewJavaClassDataModel)sessionBeanDataModel.getNestedModel("NewEJBJavaClassDataModel");
- List ints = (List)classDataModel.getProperty(NewJavaClassDataModel.INTERFACES);
- Iterator iterator = ints.iterator();
- String intStr = (iterator.hasNext()? (String)iterator.next() : "javax.ejb.SessionBean");
- while (iterator.hasNext()) {
- String intrfc = (String) iterator.next();
- intStr += ", " + intrfc ;
- }
-
- return intStr;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.ejb.annotation.model.ISessionBeanDelegate#getSimpleClassName()
- */
- public String getSimpleClassName() {
- NewJavaClassDataModel classDataModel = (NewJavaClassDataModel)sessionBeanDataModel.getNestedModel("NewEJBJavaClassDataModel");
- return classDataModel.getStringProperty(NewJavaClassDataModel.CLASS_NAME);
- }
-
- public String getSessionType() {
- return session.getSessionType().getName();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.ejb.annotation.model.ISessionBeanDelegate#getTransactionType()
- */
- public String getTransactionType() {
- return session.getTransactionType().getName();
- }
-
- public String getDisplayName() {
- return sessionBeanDataModel.getStringProperty(SessionBeanDataModel.DISPLAY_NAME);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.ejb.annotation.model.ISessionBeanDelegate#getDescription()
- */
- public String getDescription() {
- return sessionBeanDataModel.getStringProperty(SessionBeanDataModel.DESCRIPTION);
- }
-
-}
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 c08975f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/operations/AddMessageDrivenBeanOperation.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.ICommand;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-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.jst.j2ee.ejb.annotation.internal.model.BeanFactory;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.EjbCommonDataModel;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.MessageDrivenBeanDataModel;
-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.MessageDrivenEjbEmitter;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.emitter.model.IMessageDrivenBeanDelegate;
-import org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModel;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation;
-
-
-
-public class AddMessageDrivenBeanOperation extends WTPOperation {
- /**
- * @param dataModel
- */
- public AddMessageDrivenBeanOperation(EjbCommonDataModel dataModel) {
- super(dataModel);
- }
-
- protected void execute(IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException {
- createDefaultSessionBean(monitor);
-
- }
-
- private void createDefaultSessionBean(IProgressMonitor monitor) {
-
- MessageDrivenBeanDataModel ejbModel = (MessageDrivenBeanDataModel)this.getOperationDataModel();
- NewJavaClassDataModel ejbClassModel = (NewJavaClassDataModel)ejbModel.getNestedModel("NewEJBJavaClassDataModel");
-
- MessageDriven mdBean = EjbFactory.eINSTANCE.createMessageDriven();
- mdBean.setName(ejbModel.getStringProperty(EjbCommonDataModel.EJB_NAME));
- mdBean.setDescription(ejbModel.getStringProperty(EjbCommonDataModel.DESCRIPTION));
- mdBean.setDisplayName(ejbModel.getStringProperty(EjbCommonDataModel.DISPLAY_NAME));
- mdBean.setEjbClassName(ejbClassModel.getQualifiedClassName());
-
- String destType = ejbModel.getStringProperty(MessageDrivenBeanDataModel.DESTINATIONTYPE);
- DestinationType dType = DestinationType.QUEUE_LITERAL;
- if( destType.equals(DestinationType.TOPIC_LITERAL.getName()))
- dType = DestinationType.TOPIC_LITERAL;
-
- MessageDrivenDestination destination = EjbFactory.eINSTANCE.createMessageDrivenDestination();
- destination.setType(dType);
- destination.setBean(mdBean);
-
- mdBean.setDestination(destination);
- mdBean.setMessageSelector(ejbModel.getStringProperty(MessageDrivenBeanDataModel.DESTINATIONNAME));
-
- String tType = ejbModel.getStringProperty(MessageDrivenBeanDataModel.TRANSACTIONTYPE);
- TransactionType transactionType =TransactionType.CONTAINER_LITERAL;
- if(tType.equals(TransactionType.BEAN_LITERAL.getName()))
- transactionType = TransactionType.BEAN_LITERAL;
- mdBean.setTransactionType(transactionType);
-
- IMessageDrivenBeanDelegate delegate =BeanFactory.getDelegate(mdBean, ejbModel);
-
-
- try {
- IConfigurationElement[] configurationElements = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.jst.j2ee.ejb.annotations.internal.emitter.model.emitter.template");
- String builderId = configurationElements[0].getAttribute("builderId");
- addToEndOfBuildSpec( ejbClassModel.getTargetProject(), configurationElements[0].getNamespace() + "."+builderId);
- EjbEmitter ejbEmitter = new MessageDrivenEjbEmitter(configurationElements[0]);
- String fields = ejbEmitter.emitFields(delegate);
- String comment = ejbEmitter.emitTypeComment(delegate);
- String stub = ejbEmitter.emitTypeStub(delegate);
- String method = ejbEmitter.emitInterfaceMethods(delegate);
- String className = mdBean.getEjbClassName();
-
-
-
- EjbBuilder ejbBuilder = new EjbBuilder();
- ejbBuilder.setConfigurationElement(configurationElements[0]);
- ejbBuilder.setMonitor(monitor);
- ejbBuilder.setPackageFragmentRoot(ejbClassModel.getJavaPackageFragmentRoot());
- ejbBuilder.setEnterpriseBeanDelegate(delegate);
- ejbBuilder.setTypeName(ejbClassModel.getStringProperty(NewJavaClassDataModel.CLASS_NAME));
- ejbBuilder.setPackageName(ejbClassModel.getStringProperty(NewJavaClassDataModel.JAVA_PACKAGE));
-
- ejbBuilder.setTypeComment(comment);
- ejbBuilder.setTypeStub(stub);
- ejbBuilder.setMethodStub(method);
- ejbBuilder.setFields(fields);
-
- ejbBuilder.createType();
-
- } catch (ClassNotFoundException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (InstantiationException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (IllegalAccessException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (CoreException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (InterruptedException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- }
-
- /**
- * Adds a builder to the build spec for the given project.
- */
- protected void addToEndOfBuildSpec(IProject project, String builderID) throws CoreException {
- IProjectDescription description = project.getDescription();
- ICommand[] commands = description.getBuildSpec();
- boolean found = false;
- for (int i = 0; i < commands.length; ++i) {
- if (commands[i].getBuilderName().equals(builderID)) {
- found = true;
- break;
- }
- }
- if (!found) {
- ICommand command = description.newCommand();
- command.setBuilderName(builderID);
- ICommand[] newCommands = new ICommand[commands.length + 1];
- System.arraycopy(commands, 0, newCommands, 0, commands.length);
- newCommands[commands.length] = command;
- IProjectDescription desc = project.getDescription();
- desc.setBuildSpec(newCommands);
- project.setDescription(desc, 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 15c1e9c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/src/org/eclipse/jst/j2ee/ejb/annotation/internal/operations/AddSessionBeanOperation.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.ICommand;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-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.jst.j2ee.ejb.annotation.internal.model.BeanFactory;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.EjbCommonDataModel;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.MessageDrivenBeanDataModel;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.SessionBeanDataModel;
-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.SessionEjbEmitter;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.emitter.model.ISessionBeanDelegate;
-import org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModel;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation;
-
-
-
-public class AddSessionBeanOperation extends WTPOperation {
- /**
- * @param dataModel
- */
- public AddSessionBeanOperation(EjbCommonDataModel dataModel) {
- super(dataModel);
- }
-
- protected void execute(IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException {
- createDefaultSessionBean(monitor);
-
- }
-
- private void createDefaultSessionBean(IProgressMonitor monitor) {
-
- SessionBeanDataModel ejbModel = (SessionBeanDataModel)this.getOperationDataModel();
- NewJavaClassDataModel ejbClassModel = (NewJavaClassDataModel)ejbModel.getNestedModel("NewEJBJavaClassDataModel");
-
- Session sessionBean = EjbFactory.eINSTANCE.createSession();
- sessionBean.setName(ejbModel.getStringProperty(EjbCommonDataModel.EJB_NAME));
- sessionBean.setDescription(ejbModel.getStringProperty(EjbCommonDataModel.DESCRIPTION));
- sessionBean.setDisplayName(ejbModel.getStringProperty(EjbCommonDataModel.DISPLAY_NAME));
- sessionBean.setEjbClassName(ejbClassModel.getQualifiedClassName());
-
- String stateType = ejbModel.getStringProperty(EjbCommonDataModel.STATELESS);
- SessionType sessionBeanType = SessionType.STATELESS_LITERAL;
- if( stateType.equals(SessionType.STATEFUL_LITERAL.getName()))
- sessionBeanType = SessionType.STATEFUL_LITERAL;
- sessionBean.setSessionType(sessionBeanType);
-
- String tType = ejbModel.getStringProperty(MessageDrivenBeanDataModel.TRANSACTIONTYPE);
- TransactionType transactionType =TransactionType.CONTAINER_LITERAL;
- if(tType.equals(TransactionType.BEAN_LITERAL.getName()))
- transactionType = TransactionType.BEAN_LITERAL;
- sessionBean.setTransactionType(transactionType);
-
-
- ISessionBeanDelegate delegate =BeanFactory.getDelegate(sessionBean, ejbModel);
-
-
- try {
- IConfigurationElement[] configurationElements = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.jst.j2ee.ejb.annotations.emitter.template");
- String builderId = configurationElements[0].getAttribute("builderId");
- addToEndOfBuildSpec( ejbClassModel.getTargetProject(), configurationElements[0].getNamespace() + "."+builderId);
- EjbEmitter ejbEmitter = new SessionEjbEmitter(configurationElements[0]);
- String comment = ejbEmitter.emitTypeComment(delegate);
- String stub = ejbEmitter.emitTypeStub(delegate);
- String method = ejbEmitter.emitInterfaceMethods(delegate);
- String className = sessionBean.getEjbClassName();
-
-
-
- EjbBuilder ejbBuilder = new EjbBuilder();
- ejbBuilder.setConfigurationElement(configurationElements[0]);
- ejbBuilder.setMonitor(monitor);
- ejbBuilder.setPackageFragmentRoot(ejbClassModel.getJavaPackageFragmentRoot());
- ejbBuilder.setEnterpriseBeanDelegate(delegate);
- ejbBuilder.setTypeName(ejbClassModel.getStringProperty(NewJavaClassDataModel.CLASS_NAME));
- ejbBuilder.setPackageName(ejbClassModel.getStringProperty(NewJavaClassDataModel.JAVA_PACKAGE));
-
- ejbBuilder.setTypeComment(comment);
- ejbBuilder.setTypeStub(stub);
- ejbBuilder.setMethodStub(method);
- ejbBuilder.setFields("");
-
- ejbBuilder.createType();
-
- } catch (ClassNotFoundException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (InstantiationException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (IllegalAccessException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (CoreException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (InterruptedException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- }
-
- /**
- * Adds a builder to the build spec for the given project.
- */
- protected void addToEndOfBuildSpec(IProject project, String builderID) throws CoreException {
- IProjectDescription description = project.getDescription();
- ICommand[] commands = description.getBuildSpec();
- boolean found = false;
- for (int i = 0; i < commands.length; ++i) {
- if (commands[i].getBuilderName().equals(builderID)) {
- found = true;
- break;
- }
- }
- if (!found) {
- ICommand command = description.newCommand();
- command.setBuilderName(builderID);
- ICommand[] newCommands = new ICommand[commands.length + 1];
- System.arraycopy(commands, 0, newCommands, 0, commands.length);
- newCommands[commands.length] = command;
- IProjectDescription desc = project.getDescription();
- desc.setBuildSpec(newCommands);
- project.setDescription(desc, null);
- }
- }
-
-}
\ No newline at end of file
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 065ac06..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.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <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 4ed1973..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-ejbEmitter.jar
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/build.properties b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/build.properties
deleted file mode 100644
index 221fffb..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.ejbEmitter.jar = src/
-output.ejbEmitter.jar = bin/
-bin.includes = plugin.xml,\
- ejbEmitter.jar
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 98e02ec..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/plugin.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
- id="org.eclipse.jst.j2ee.ejb.annotations.emitter"
- name="EJB Emitter Plug-in"
- version="1.0.0"
- provider-name="Eteration"
- class="org.eclipse.jst.j2ee.ejb.annotations.internal.emitter.EjbEmitterPlugin">
-
- <runtime>
- <library name="ejbEmitter.jar">
- <export name="*"/>
- </library>
- </runtime>
-
- <requires>
- <import plugin="org.eclipse.ui"/>
-
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.core.resources"/>
-
- <import plugin="org.eclipse.emf.ecore"/>
- <import plugin="org.eclipse.emf.ecore.xmi"/>
- <import plugin="org.eclipse.emf.codegen"/>
-
- <import plugin="org.eclipse.wst.common.frameworks"/>
- <import plugin="org.eclipse.wst.common.frameworks.ui"/>
-
- <import plugin="org.eclipse.jdt.core"/>
- <import plugin="org.eclipse.jdt"/>
- <import plugin="org.eclipse.jdt.ui"/>
-
- <import plugin="org.eclipse.jst.j2ee.core"/>
-
- <import plugin="org.eclipse.text"/>
- <import plugin="org.eclipse.jst.j2ee"/>
-
- </requires>
-
- <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 9d87222..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/schema/emitter.exsd
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.j2ee.ejb.annotations.emitter">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.j2ee.ejb.annotations.emitter" id="emitter" name="emitter"/>
- </appInfo>
- <documentation>
- This extension point allows vendors and developers to provide their templates for ejb code generation using the Lomboz emitter framework.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="emitter"/>
- </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/schema/org.eclipse.jst.j2ee.ejb.annotations.emitter.exsd b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/schema/org.eclipse.jst.j2ee.ejb.annotations.emitter.exsd
deleted file mode 100644
index 16cfc85..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/schema/org.eclipse.jst.j2ee.ejb.annotations.emitter.exsd
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.j2ee.ejb.annotations.emitter">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.j2ee.ejb.annotations.emitter.org.eclipse.jst.j2ee.ejb.annotations.emitter" id="classpathProvider" name="EmitterClasspathProvider"/>
- </appInfo>
- <documentation>
- [Enter description of this extension point.]
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- </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>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- [Enter the first release in which this extension point appears.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.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 d8fba4b..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.annotations.internal.emitter.model.IEnterpriseBeanDelegate;
-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 IEnterpriseBeanDelegate 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.JLS2);
- sourceParser.setSource(sourceSrc.toCharArray());
- final CompilationUnit sourceAst = (CompilationUnit) sourceParser.createAST(null);
- ASTParser targetParser = ASTParser.newParser(AST.JLS2);
- 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.getReturnType();
- 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.JLS2);
- 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 IEnterpriseBeanDelegate getEnterpriseBeanDelegate() {
- return enterpriseBeanDelegate;
- }
- /**
- * @param IEnterpriseBeanDelegate The IEnterpriseBeanDelegate to set.
- */
- public void setEnterpriseBeanDelegate(IEnterpriseBeanDelegate IEnterpriseBeanDelegate) {
- this.enterpriseBeanDelegate = IEnterpriseBeanDelegate;
- }
-}
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 11d475a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/DefaultEjbIntrospector.java
+++ /dev/null
@@ -1,133 +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: DefaultEjbIntrospector.java,v 1.1 2005/02/05 23:25:08 ndai Exp $
- */
-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 046e4c8..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/EjbEmitter.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.annotations.internal.emitter.model.IEnterpriseBeanDelegate;
-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(IEnterpriseBeanDelegate enterpriseBean) throws ClassNotFoundException, InstantiationException, IllegalAccessException, CoreException;
- public abstract String emitTypeStub(IEnterpriseBeanDelegate enterpriseBean) throws ClassNotFoundException, InstantiationException, IllegalAccessException, CoreException;
- public abstract String emitInterfaceMethods(IEnterpriseBeanDelegate enterpriseBean) throws ClassNotFoundException, InstantiationException, IllegalAccessException, CoreException;
- public abstract String emitFields(IEnterpriseBeanDelegate 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, IEnterpriseBeanDelegate 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;
- }
-}
\ 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/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 d4897c7..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.annotations.internal.emitter.model.IEnterpriseBeanDelegate;
-
-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(IEnterpriseBeanDelegate root)
- throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException {
- return generate(emitterConfig.getAttribute(TEMPLATESDIR), TYPE_COMMENT,
- root);
- }
- public String emitTypeStub(IEnterpriseBeanDelegate root)
- throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException {
- return generate(emitterConfig.getAttribute(TEMPLATESDIR), TYPE_STUB,
- root);
- }
- public String emitInterfaceMethods(IEnterpriseBeanDelegate root)
- throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException {
- return generate(emitterConfig.getAttribute(TEMPLATESDIR), METHOD_STUBS,
- root);
- }
- public String emitFields(IEnterpriseBeanDelegate 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 7a748b7..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.annotations.internal.emitter.model.IEnterpriseBeanDelegate;
-
-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(IEnterpriseBeanDelegate root)
- throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException {
- return generate(emitterConfig.getAttribute(TEMPLATESDIR), TYPE_COMMENT,
- root);
- }
- public String emitTypeStub(IEnterpriseBeanDelegate root)
- throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException {
- return generate(emitterConfig.getAttribute(TEMPLATESDIR), TYPE_STUB,
- root);
- }
- public String emitInterfaceMethods(IEnterpriseBeanDelegate root)
- throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException {
- return generate(emitterConfig.getAttribute(TEMPLATESDIR), METHOD_STUBS,
- root);
- }
- public String emitFields(IEnterpriseBeanDelegate 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 f8b177d..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.annotations.internal.emitter.model.IEnterpriseBeanDelegate;
-
-
-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(IEnterpriseBeanDelegate root)
- throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException {
- return generate(emitterConfig.getAttribute(TEMPLATESDIR), TYPE_COMMENT,
- root);
- }
- public String emitTypeStub(IEnterpriseBeanDelegate root)
- throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException {
- return generate(emitterConfig.getAttribute(TEMPLATESDIR), TYPE_STUB,
- root);
- }
- public String emitInterfaceMethods(IEnterpriseBeanDelegate root)
- throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, CoreException {
- return generate(emitterConfig.getAttribute(TEMPLATESDIR), METHOD_STUBS,
- root);
- }
- public String emitFields(IEnterpriseBeanDelegate 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/model/IEnterpriseBeanDelegate.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/model/IEnterpriseBeanDelegate.java
deleted file mode 100644
index 8d53e03..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/model/IEnterpriseBeanDelegate.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.jst.j2ee.ejb.annotations.internal.emitter.model;
-
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel;
-
-/**
- * @author naci
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public interface IEnterpriseBeanDelegate {
-
- public EnterpriseBean getEjb();
- public WTPOperationDataModel getDataModel();
-
- 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.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/model/IMessageDrivenBeanDelegate.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/model/IMessageDrivenBeanDelegate.java
deleted file mode 100644
index 7093d29..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/model/IMessageDrivenBeanDelegate.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.jst.j2ee.ejb.annotations.internal.emitter.model;
-
-
-/**
- * @author naci
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public interface IMessageDrivenBeanDelegate extends IEnterpriseBeanDelegate{
-
-
- public String getDestinationType();
- public String getDestinationJndiName();
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/model/ISessionBeanDelegate.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/model/ISessionBeanDelegate.java
deleted file mode 100644
index 4215d20..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/src/org/eclipse/jst/j2ee/ejb/annotations/internal/emitter/model/ISessionBeanDelegate.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.model;
-
-
-/**
- * @author naci
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public interface ISessionBeanDelegate extends IEnterpriseBeanDelegate{
-
-
- public String getSessionType();
-
-
-}
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 065ac06..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.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <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 2790e29..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-temp.folder
-build.xml
-ejbAnnotationsUi.jar
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/build.properties b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/build.properties
deleted file mode 100644
index a717acf..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-source.ejbAnnotationsUi.jar = src/
-output.ejbAnnotationsUi.jar = bin/
-bin.includes = plugin.xml,\
- ejbAnnotationsUi.jar,\
- icons/,\
- plugin.properties
-src.includes = icons/,\
- plugin.xml,\
- plugin.properties
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 03eec2f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/plugin.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-ejb.category_ui_=EJB
-ejb.createbean_ui_= Session Bean
-ejb.createmdbean_ui_= MessageDriven Bean
-new.sejb.description_ui_=Create Session bean
-new.mejb.description_ui_=Create a MessageDriven bean
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 b9192e1..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/plugin.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
- id="org.eclipse.jst.j2ee.ejb.annotations.ui"
- name="EJB Annotations Ui Plug-in"
- version="1.0.0"
- provider-name="Eteration"
- class="org.eclipse.jst.j2ee.ejb.annotation.ui.internal.EjbAnnotationsUiPlugin">
-
- <runtime>
- <library name="ejbAnnotationsUi.jar">
- <export name="*"/>
- </library>
- </runtime>
-
- <requires>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.core.resources"/>
-
- <import plugin="org.eclipse.jdt.ui"/>
- <import plugin="org.eclipse.jdt.core"/>
-
- <import plugin="org.eclipse.wst.common.frameworks"/>
- <import plugin="org.eclipse.wst.common.frameworks.ui"/>
- <import plugin="org.eclipse.wst.common.emfworkbench.integration"/>
- <import plugin="org.eclipse.wst.common.navigator.workbench"/>
- <import plugin="org.eclipse.wst.common.migration"/>
- <import plugin="org.eclipse.wst.server.ui"/>
- <import plugin="org.eclipse.wst.server.core"/>
- <import plugin="org.eclipse.wst.common.emf"/>
-
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.ui.views"/>
- <import plugin="org.eclipse.ui.workbench"/>
- <import plugin="org.eclipse.ui.ide"/>
-
-
- <import plugin="org.eclipse.jst.j2ee"/>
- <import plugin="org.eclipse.jst.j2ee.core"/>
- <import plugin="org.eclipse.jst.j2ee.ui" />
- <import plugin="org.eclipse.jst.common.frameworks"/>
- <import plugin="org.eclipse.jst.common.annotations.controller"/>
- <import plugin="org.eclipse.jst.j2ee.ejb"/>
- <import plugin="org.eclipse.jst.j2ee.ejb.annotations.emitter"/>
- <import plugin="org.eclipse.jst.j2ee.ejb.annotation.model"/>
-
-
- <import plugin="org.eclipse.jem.workbench"/>
- <import plugin="org.eclipse.jem"/>
- <import plugin="org.eclipse.emf.edit"/>
- <import plugin="org.eclipse.emf.ecore.xmi"/>
- <import plugin="org.eclipse.wst.common.modulecore"/>
- </requires>
-
-<!--================================-->
-<!-- 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.AddSessionEjbWizard"
- id="org.eclipse.jst.j2ee.ejb.annotation.ui.internal.AddSessionEjbWizard">
- <description>
- %new.sejb.description_ui_
- </description>
- </wizard>
- </extension>
- <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.createmdbean_ui_"
- icon="icons/full/ctool16/newmessageejb_wiz.gif"
- category="org.eclipse.jst.ejb.ui"
- class="org.eclipse.jst.j2ee.ejb.annotation.ui.internal.AddMessageDrivenEjbWizard"
- id="org.eclipse.jst.j2ee.ejb.annotation.ui.internal.AddMessageDrivenEjbWizard">
- <description>
- %new.mejb.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.AddSessionEjbWizard">
- <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>
- <extension
- point="org.eclipse.wst.common.navigator.workbench.commonWizard">
- <commonWizard
- type="new"
- wizardId="org.eclipse.jst.j2ee.ejb.annotation.ui.internal.AddMessageDrivenEjbWizard">
- <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>
-
-</plugin>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/AddMessageDrivenBeanWizardPage.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/AddMessageDrivenBeanWizardPage.java
deleted file mode 100644
index 12b29a3..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/AddMessageDrivenBeanWizardPage.java
+++ /dev/null
@@ -1,217 +0,0 @@
-
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 org.eclipse.core.resources.IProject;
-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.EjbCommonDataModel;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.MessageDrivenBeanDataModel;
-import org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModel;
-import org.eclipse.jst.j2ee.internal.wizard.AnnotationsStandaloneGroup;
-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.Button;
-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.frameworks.internal.operations.ProjectCreationDataModel;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-import org.eclipse.wst.common.frameworks.internal.ui.WTPWizardPage;
-
-
-public class AddMessageDrivenBeanWizardPage extends WTPWizardPage implements IBeanWizardPage{
-
-
- private Text ejbNameText;
- private Text jndiNameText;
- private Text displayNameText;
- private Text descriptionText;
-
- private Label classLabel;
-
- private Text classText;
-
- private Button classButton;
-
- private Combo destinationButton;
-
-
- private AnnotationsStandaloneGroup annotationsGroup = null;
- private Combo transactionButton;
-
- public AddMessageDrivenBeanWizardPage(MessageDrivenBeanDataModel model, String pageName) {
- super(model, pageName);
- setDescription(IEJBAnnotationConstants.ADD_MESSAGE_EJB_WIZARD_PAGE_DESC);
- this.setTitle(IEJBAnnotationConstants.ADD_MESSAGE_EJB_WIZARD_PAGE_TITLE);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.wtp.common.ui.wizard.WTPWizardPage#getValidationPropertyNames()
- */
- protected String[] getValidationPropertyNames() {
- return new String[]{
- EjbCommonDataModel.EJB_NAME,
- MessageDrivenBeanDataModel.DESTINATIONNAME,
- EjbCommonDataModel.DISPLAY_NAME,
- EjbCommonDataModel.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(NewJavaClassDataModel.PROJECT_NAME) == null || model.getStringProperty(NewJavaClassDataModel.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, EjbCommonDataModel.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, EjbCommonDataModel.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, EjbCommonDataModel.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, EjbCommonDataModel.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 statelessLabel = new Label(composite, SWT.LEFT);
- statelessLabel.setText(IEJBAnnotationConstants.DESTINATION_LABEL);
- statelessLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
- destinationButton = new Combo(composite, SWT.CHECK);
- 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));
- synchHelper.synchCombo(destinationButton, MessageDrivenBeanDataModel.DESTINATIONTYPE, null);
- destinationButton.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.CHECK);
- 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, EjbCommonDataModel.TRANSACTIONTYPE, null);
- transactionButton.select(0);
-
- }
-
-
-
- public boolean canFlipToNextPage() {
- return super.canFlipToNextPage();
- }
-
- public boolean canFinish() {
- return false;
- }
-
- /**
- * Create annotations group and set default enablement
- */
- private void createAnnotationsGroup(Composite parent) {
- annotationsGroup = new AnnotationsStandaloneGroup(parent, model, true, true);
- IProject project = null;
- project = ProjectCreationDataModel.getProjectHandleFromProjectName(model.getStringProperty(NewJavaClassDataModel.PROJECT_NAME));
- annotationsGroup.setEnablement(project);
- annotationsGroup.setUseAnnotations(true);
- }
-
- 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(MessageDrivenBeanDataModel.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/AddMessageDrivenEjbWizard.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/AddMessageDrivenEjbWizard.java
deleted file mode 100644
index e09fda0..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/AddMessageDrivenEjbWizard.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.ejb.annotation.ui.internal;
-
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.messages.IEJBAnnotationConstants;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.EjbCommonDataModel;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.MessageDrivenBeanDataModel;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.NewEJBJavaClassDataModel;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.operations.AddMessageDrivenBeanOperation;
-import org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModel;
-import org.eclipse.jst.j2ee.internal.wizard.NewJavaClassOptionsWizardPage;
-import org.eclipse.jst.j2ee.internal.wizard.NewJavaClassWizardPage;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-
-
-public class AddMessageDrivenEjbWizard extends NewEjbWizard {
- private static final String PAGE_ONE = "pageOne"; //$NON-NLS-1$
- private static final String PAGE_TWO = "pageTwo"; //$NON-NLS-1$
- private static final String PAGE_THREE = "pageThree"; //$NON-NLS-1$
- /**
- * @param model
- */
- public AddMessageDrivenEjbWizard(EjbCommonDataModel model) {
- super(model);
- setWindowTitle(IEJBAnnotationConstants.ADD_SESSION_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 com.ibm.wtp.common.ui.wizard.WTPWizard#createDefaultModel()
- */
- protected WTPOperationDataModel createDefaultModel() {
- if (model != null)
- return model;
- model = new MessageDrivenBeanDataModel();
- NewEJBJavaClassDataModel nestedModel = new NewEJBJavaClassDataModel();
- model.addNestedModel("NewEJBJavaClassDataModel", nestedModel); //$NON-NLS-1$
- //nestedModel.setProperty(NewServletClassDataModel.EDITING_DOMAIN, domain);
- nestedModel.setProperty(NewJavaClassDataModel.SUPERCLASS, ((MessageDrivenBeanDataModel)model).getEjbSuperclassName());
- nestedModel.setProperty(NewJavaClassDataModel.INTERFACES, ((MessageDrivenBeanDataModel)model).getEJBInterfaces());
- nestedModel.setBooleanProperty(NewJavaClassDataModel.MODIFIER_ABSTRACT,true);
- //nestedModel.setParentDataModel(model);
-
- IProject project = getDefaultEjbProject();
- if (project != null) {
- model.setProperty(NewJavaClassDataModel.PROJECT_NAME, project.getName());
- nestedModel.setProperty(NewJavaClassDataModel.PROJECT_NAME, project.getName());
- }
- return model;
- }
- /* (non-Javadoc)
- * @see com.ibm.wtp.common.ui.wizard.WTPWizard#createOperation()
- */
- protected WTPOperation createBaseOperation() {
- return new AddMessageDrivenBeanOperation((MessageDrivenBeanDataModel)model) ;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.Wizard#addPages()
- */
- public void doAddPages() {
- NewJavaClassDataModel nestedModel = (NewJavaClassDataModel)model.getNestedModel("NewEJBJavaClassDataModel"); //$NON-NLS-1$
- NewJavaClassWizardPage page1 = new NewJavaClassWizardPage(
- nestedModel,
- PAGE_ONE,
- IEJBAnnotationConstants.NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC,
- IEJBAnnotationConstants.ADD_MESSAGE_EJB_WIZARD_PAGE_TITLE,
- IModuleConstants.JST_EJB_MODULE);
- page1.setInfopopID(IEJBUIContextIds.ANNOTATION_EJB_PAGE_ADD_ADD_WIZARD_2);
- addPage(page1);
- AddMessageDrivenBeanWizardPage page2 = new AddMessageDrivenBeanWizardPage((MessageDrivenBeanDataModel) model, PAGE_TWO);
- page2.setInfopopID(IEJBUIContextIds.ANNOTATION_EJB_PAGE_ADD_ADD_WIZARD_1);
- addPage(page2);
- page2.setPageComplete(false);
- NewJavaClassOptionsWizardPage page3 = new NewJavaClassOptionsWizardPage(
- nestedModel,
- PAGE_THREE,
- IEJBAnnotationConstants.NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC,
- IEJBAnnotationConstants.ADD_MESSAGE_EJB_WIZARD_PAGE_TITLE);
- page3.setInfopopID(IEJBUIContextIds.ANNOTATION_EJB_PAGE_ADD_ADD_WIZARD_3);
- addPage(page3);
- }
-
- /* (non-Javadoc)
- * @see com.ibm.wtp.common.ui.wizard.WTPWizard#runForked()
- */
- protected boolean runForked() {
- return false;
- }
-
- public boolean canFinish() {
- NewJavaClassWizardPage firstPage = (NewJavaClassWizardPage)getPage(PAGE_ONE);
- AddMessageDrivenBeanWizardPage secondPage = (AddMessageDrivenBeanWizardPage)getPage(PAGE_TWO);
- if (firstPage != null && firstPage.isPageComplete() && secondPage.isPageComplete() ) {
- return true;
- }
- return false;//super.canFinish();
- }
-}
\ 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/AddSessionBeanWizardPage.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/AddSessionBeanWizardPage.java
deleted file mode 100644
index 200d3f3..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/AddSessionBeanWizardPage.java
+++ /dev/null
@@ -1,216 +0,0 @@
-
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.jst.j2ee.ejb.annotation.ui.internal;
-
-
-import org.eclipse.core.resources.IProject;
-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.EjbCommonDataModel;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.SessionBeanDataModel;
-import org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModel;
-import org.eclipse.jst.j2ee.internal.wizard.AnnotationsStandaloneGroup;
-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.Button;
-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.frameworks.internal.operations.ProjectCreationDataModel;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-import org.eclipse.wst.common.frameworks.internal.ui.WTPWizardPage;
-
-
-public class AddSessionBeanWizardPage extends WTPWizardPage implements IBeanWizardPage{
-
-
- private Text ejbNameText;
- private Text jndiNameText;
- private Text displayNameText;
- private Text descriptionText;
-
- private Label classLabel;
-
- private Text classText;
-
- private Button classButton;
-
- private Combo statelessButton;
-
-
- private AnnotationsStandaloneGroup annotationsGroup = null;
- private Combo transactionButton;
-
- public AddSessionBeanWizardPage(SessionBeanDataModel model, String pageName) {
- super(model, pageName);
- setDescription(IEJBAnnotationConstants.ADD_SESSION_EJB_WIZARD_PAGE_DESC);
- this.setTitle(IEJBAnnotationConstants.ADD_SESSION_EJB_WIZARD_PAGE_TITLE);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.wtp.common.ui.wizard.WTPWizardPage#getValidationPropertyNames()
- */
- protected String[] getValidationPropertyNames() {
- return new String[]{
- EjbCommonDataModel.EJB_NAME,
- EjbCommonDataModel.JNDI_NAME,
- EjbCommonDataModel.DISPLAY_NAME,
- EjbCommonDataModel.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(NewJavaClassDataModel.PROJECT_NAME) == null || model.getStringProperty(NewJavaClassDataModel.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, EjbCommonDataModel.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, EjbCommonDataModel.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, EjbCommonDataModel.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, EjbCommonDataModel.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.CHECK);
- 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, EjbCommonDataModel.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.CHECK);
- 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, EjbCommonDataModel.TRANSACTIONTYPE, null);
- transactionButton.select(0);
-
- }
-
-
-
- public boolean canFlipToNextPage() {
- return super.canFlipToNextPage();
- }
-
- public boolean canFinish() {
- return false;
- }
-
- /**
- * Create annotations group and set default enablement
- */
- private void createAnnotationsGroup(Composite parent) {
- annotationsGroup = new AnnotationsStandaloneGroup(parent, model, true, true);
- IProject project = null;
- project = ProjectCreationDataModel.getProjectHandleFromProjectName(model.getStringProperty(NewJavaClassDataModel.PROJECT_NAME));
- annotationsGroup.setEnablement(project);
- annotationsGroup.setUseAnnotations(true);
- }
-
- 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(SessionBeanDataModel.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/AddSessionEjbWizard.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/AddSessionEjbWizard.java
deleted file mode 100644
index b728cb2..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/AddSessionEjbWizard.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.messages.IEJBAnnotationConstants;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.EjbCommonDataModel;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.NewEJBJavaClassDataModel;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.SessionBeanDataModel;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.operations.AddSessionBeanOperation;
-import org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModel;
-import org.eclipse.jst.j2ee.internal.wizard.NewJavaClassOptionsWizardPage;
-import org.eclipse.jst.j2ee.internal.wizard.NewJavaClassWizardPage;
-import org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditOperationDataModel;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel;
-
-
-public class AddSessionEjbWizard extends NewEjbWizard {
- private static final String PAGE_ONE = "pageOne"; //$NON-NLS-1$
- private static final String PAGE_TWO = "pageTwo"; //$NON-NLS-1$
- private static final String PAGE_THREE = "pageThree"; //$NON-NLS-1$
- /**
- * @param model
- */
- public AddSessionEjbWizard(EjbCommonDataModel model) {
- super(model);
- setWindowTitle(IEJBAnnotationConstants.ADD_SESSION_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 com.ibm.wtp.common.ui.wizard.WTPWizard#createDefaultModel()
- */
- protected WTPOperationDataModel createDefaultModel() {
- if (model != null)
- return model;
- model = new SessionBeanDataModel();
- NewEJBJavaClassDataModel nestedModel = new NewEJBJavaClassDataModel();
- model.addNestedModel("NewEJBJavaClassDataModel", nestedModel); //$NON-NLS-1$
- //nestedModel.setProperty(NewServletClassDataModel.EDITING_DOMAIN, domain);
- nestedModel.setProperty(NewJavaClassDataModel.SUPERCLASS, ((SessionBeanDataModel)model).getEjbSuperclassName());
- nestedModel.setProperty(NewJavaClassDataModel.INTERFACES, ((SessionBeanDataModel)model).getEJBInterfaces());
- nestedModel.setBooleanProperty(NewJavaClassDataModel.MODIFIER_ABSTRACT,true);
- //nestedModel.setParentDataModel(model);
-
- IProject project = getDefaultEjbProject();
- if (project != null) {
- model.setProperty(ArtifactEditOperationDataModel.PROJECT_NAME, project.getName());
- nestedModel.setProperty(ArtifactEditOperationDataModel.PROJECT_NAME, project.getName());
- }
- return model;
- }
- /* (non-Javadoc)
- * @see com.ibm.wtp.common.ui.wizard.WTPWizard#createOperation()
- */
- protected WTPOperation createBaseOperation() {
- return new AddSessionBeanOperation((SessionBeanDataModel)model) ;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.Wizard#addPages()
- */
- public void doAddPages() {
- NewJavaClassDataModel nestedModel = (NewJavaClassDataModel)model.getNestedModel("NewEJBJavaClassDataModel"); //$NON-NLS-1$
- NewJavaClassWizardPage page1 = new NewJavaClassWizardPage(
- nestedModel,
- PAGE_ONE,
- IEJBAnnotationConstants.NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC,
- IEJBAnnotationConstants.ADD_SESSION_EJB_WIZARD_PAGE_TITLE,
- IModuleConstants.JST_EJB_MODULE);
- page1.setInfopopID(IEJBUIContextIds.ANNOTATION_EJB_PAGE_ADD_ADD_WIZARD_2);
- addPage(page1);
- AddSessionBeanWizardPage page2 = new AddSessionBeanWizardPage((SessionBeanDataModel) model, PAGE_TWO);
- page2.setInfopopID(IEJBUIContextIds.ANNOTATION_EJB_PAGE_ADD_ADD_WIZARD_1);
- addPage(page2);
- page2.setPageComplete(false);
- NewJavaClassOptionsWizardPage page3 = new NewJavaClassOptionsWizardPage(
- nestedModel,
- PAGE_THREE,
- IEJBAnnotationConstants.NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC,
- IEJBAnnotationConstants.ADD_SESSION_EJB_WIZARD_PAGE_TITLE);
- page3.setInfopopID(IEJBUIContextIds.ANNOTATION_EJB_PAGE_ADD_ADD_WIZARD_3);
- addPage(page3);
- }
-
- /* (non-Javadoc)
- * @see com.ibm.wtp.common.ui.wizard.WTPWizard#runForked()
- */
- protected boolean runForked() {
- return false;
- }
-
- public boolean canFinish() {
- NewJavaClassWizardPage firstPage = (NewJavaClassWizardPage)getPage(PAGE_ONE);
- AddSessionBeanWizardPage secondPage = (AddSessionBeanWizardPage)getPage(PAGE_TWO);
- if (firstPage != null && firstPage.isPageComplete() && secondPage != null && secondPage.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/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/IBeanWizardPage.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/IBeanWizardPage.java
deleted file mode 100644
index 287ae35..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/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;
-
-/**
- * @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/IEJBUIContextIds.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/IEJBUIContextIds.java
deleted file mode 100644
index d5d5404..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/IEJBUIContextIds.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.jst.j2ee.ejb.annotation.ui.internal;
-
-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_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/NewEjbWizard.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/NewEjbWizard.java
deleted file mode 100644
index 07a8c2b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/src/org/eclipse/jst/j2ee/ejb/annotation/ui/internal/NewEjbWizard.java
+++ /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
- **************************************************************************************************/
-
-package org.eclipse.jst.j2ee.ejb.annotation.ui.internal;
-
-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.modulecore.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.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel;
-import org.eclipse.wst.common.frameworks.internal.ui.WTPWizard;
-
-public abstract class NewEjbWizard extends WTPWizard implements INewWizard {
-
- /**
- * @param model
- */
- public NewEjbWizard(WTPOperationDataModel model) {
- super(model);
- }
-
- /**
- * Default constructor
- */
- public NewEjbWizard() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.wtp.common.ui.wizard.WTPWizard#createDefaultModel()
- */
- protected abstract WTPOperationDataModel createDefaultModel();
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench,
- * org.eclipse.jface.viewers.IStructuredSelection)
- */
- public void init(IWorkbench workbench, IStructuredSelection selection) {
- createDefaultModel();
- }
-
- 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 065ac06..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.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <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 ed19c25..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-temp.folder
-build.xml
-xdocletAnnotation.jar
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/build.properties b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/build.properties
deleted file mode 100644
index 579b154..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-source.xdocletAnnotation.jar = src/
-output.xdocletAnnotation.jar = bin/
-bin.includes = plugin.xml,\
- xdocletAnnotation.jar,\
- ejb-merge.xml,\
- templates/
-src.includes = templates/,\
- plugin.xml,\
- ejb-merge.xml
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.xml b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/plugin.xml
deleted file mode 100644
index 7d08336..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/plugin.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
- id="org.eclipse.jst.j2ee.ejb.annotations.xdoclet"
- name="Xdoclet Annotations Plug-in"
- version="1.0.0"
- provider-name="Eteration"
- class="org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletAnnotationPlugin">
-
- <runtime>
- <library name="xdocletAnnotation.jar">
- <export name="*"/>
- </library>
- </runtime>
-
- <requires>
- <import plugin="org.eclipse.jst.j2ee.ejb.annotations.emitter" export="true"/>
- <import plugin="org.eclipse.jdt"/>
- <import plugin="org.eclipse.emf.common"/>
- <import plugin="org.eclipse.emf.ecore"/>
- <import plugin="org.eclipse.jdt.core"/>
- <import plugin="org.eclipse.jst.j2ee.core"/>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.jst.common.launcher.ant"/>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.jdt.launching"/>
- <import plugin="org.eclipse.jst.j2ee"/>
- <import plugin="org.eclipse.jst.j2ee.ejb"/>
- <import plugin="org.eclipse.wst.common.emfworkbench.integration"/>
- <import plugin="org.eclipse.jst.j2ee.web"/>
- <import plugin="org.eclipse.wst.common.modulecore"/>
- <import plugin="org.eclipse.jem.workbench"/>
- <import plugin="org.eclipse.jem.util"/>
- </requires>
-
- <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="XDoclet"
- class="org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.ui.XDocletPreferencePage"
- id="org.eclipse.jst.j2ee.ejb.annotations.xdoclet.preference">
- </page>
- <page
- 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>
- </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>
-
-</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 6248b90..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletAntProjectBuilder.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.common.util.URI;
-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.common.internal.launcher.ant.AntLauncher;
-import org.eclipse.jst.j2ee.internal.web.operations.WebPropertiesUtil;
-import org.eclipse.jst.j2ee.web.modulecore.util.WebArtifactEdit;
-import org.eclipse.wst.common.componentcore.StructureEdit;
-import org.eclipse.wst.common.componentcore.UnresolveableURIException;
-import org.eclipse.wst.common.componentcore.internal.ComponentResource;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-
-
-public abstract class XDocletAntProjectBuilder {
-
- protected URL templateUrl;
-
- public static class Factory {
-
- public static XDocletAntProjectBuilder newInstance(IResource resource) {
- WebArtifactEdit webEdit = null;
- StructureEdit moduleCore = null;
- WorkbenchComponent wbModule = null;
- try {
- moduleCore = StructureEdit.getStructureEditForRead(resource.getProject());
- URI sourcePath = URI.createPlatformResourceURI(resource.getFullPath().toString());
- ComponentResource[] moduleResources = moduleCore.findResourcesBySourcePath(sourcePath);
- for (int i=0; i<moduleResources.length; i++) {
- ComponentResource moduleResource = moduleResources[i];
- if (moduleResource!=null)
- wbModule = moduleResource.getComponent();
- if (wbModule!=null)
- break;
- }
- String moduleType = wbModule.getComponentType().getComponentTypeId();
- if(moduleType.equals(IModuleConstants.JST_EJB_MODULE))
- return new XDocletEjbAntProjectBuilder();
- else if (moduleType.equals(IModuleConstants.JST_WEB_MODULE))
- return new XDocletWebAntProjectBuilder();
- } catch (UnresolveableURIException e) {
- e.printStackTrace();
- } finally {
- if (moduleCore!=null)
- moduleCore.dispose();
- if (webEdit != null)
- webEdit.dispose();
- }
- 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);
-
- AntLauncher antLauncher = new AntLauncher(templateUrl, beanClass
- .getParent().getLocation(), properties, templates);
- antLauncher.launch(getTaskName(), monitor);
- } catch (Exception e) {
- Logger.logException(e);
- }
- }
-
-
-
- protected abstract String getTaskName();
- 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();
- }
-
- protected IContainer getWebInfFolder(IJavaProject proj) {
- return WebPropertiesUtil.getJavaSourceFolder(proj.getProject());
- }
-}
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 35df8ef..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletBuilder.java
+++ /dev/null
@@ -1,382 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.HashMap;
-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.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-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;
-
- protected static class ProjectChangeListener implements IResourceChangeListener, IResourceDeltaVisitor {
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
- */
- public void resourceChanged(IResourceChangeEvent event) {
- IResourceDelta delta = event.getDelta();
- if (delta.getResource() != null) {
- int resourceType = delta.getResource().getType();
- if (resourceType == IResource.PROJECT || resourceType == IResource.ROOT) {
- try {
- delta.accept(this);
- } catch (CoreException e) {
- Logger.logException("Exception managing buildspec list", e); //$NON-NLS-1$
- }
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.resources.IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta)
- */
- public boolean visit(IResourceDelta delta) throws CoreException {
- IResource resource = delta.getResource();
- if (resource != null) {
- if (resource.getType() == IResource.ROOT)
- return true;
- else if (resource.getType() == IResource.PROJECT) {
- if (delta.getKind() == IResourceDelta.ADDED) {
- add(new NullProgressMonitor(), (IProject) resource, null);
- }
- return false;
- }
- }
- return false;
- }
- }
-
- /**
- * 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() {
- public boolean visit(IResource resource) throws CoreException {
- if (resource.getType() == IResource.FILE) {
- // for any supported file type, record the resource
- if (isXDocletAnnotatedResource(resource)) {
- build(localKind, localArgs, resource, null, subMonitor);
- 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() {
- public boolean visit(IResourceDelta delta) throws CoreException {
- if (!localMonitor.isCanceled() && delta.getResource().getType() == IResource.FILE) {
- if (isXDocletAnnotatedResource(delta.getResource()))
- build(localKind, localArgs, delta.getResource(), null, localMonitor);
- }
- 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 e0fe2dc..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletEjbAntProjectBuilder.java
+++ /dev/null
@@ -1,205 +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.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.util.URI;
-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.ejb.modulecore.util.EJBArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.wst.common.componentcore.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.ComponentResource;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-
-public class XDocletEjbAntProjectBuilder extends XDocletAntProjectBuilder {
-
- 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$
- 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());
- 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("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;
- URI sourcePath = URI.createPlatformResourceURI(resource.getFullPath().toString());
- ComponentResource[] moduleResources = core.findResourcesBySourcePath(sourcePath);
- for (int i = 0; i < moduleResources.length; i++) {
- ComponentResource moduleResource = moduleResources[i];
- if (moduleResource != null)
- ejbModule = moduleResource.getComponent();
- if (ejbModule != null)
- break;
- }
-
- ejbEdit = EJBArtifactEdit.getEJBArtifactEditForRead(ejbModule);
- 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;
-
-
- 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$
- } catch (Exception e) {
- Logger.logException(e);
- }finally{
- if(core != null)
- core.dispose();
- if(ejbEdit != null)
- ejbEdit.dispose();
- }
- return properties;
- }
-
- /**
- *
- * 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$
- return "<weblogic version=\"" + XDocletPreferenceStore.getProperty(XDocletPreferenceStore.EJB_WEBLOGIC + "_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\"" + " 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") + "\"" + " unauthenticatedPrincipal=\"nobody\"" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- + " xmlencoding=\"UTF-8\"" + " destdir=\"\\${ejb.dd.dir}\"" + " validatexml=\"false\"" + " datasource=\"\\${data.source.name}\"" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- + " datasourcemapping=\"PLEASE_MODIFY_THIS\"" + " preferredrelationmapping=\"PLEASE_MODIFY_THIS\" />"; //$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 addWebSphereTask() {
- if (!XDocletPreferenceStore.isPropertyActive(XDocletPreferenceStore.EJB_WEBSPHERE))
- return ""; //$NON-NLS-1$
- return "<webSphere destdir=\"\\${ejb.dd.dir}\"/>"; //$NON-NLS-1$
- }
-
-}
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 5b9b2bd..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletPreferenceStore.java
+++ /dev/null
@@ -1,108 +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";
-
-
- 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");
- XDocletPreferenceStore.setPropertyActive(EJB_JBOSS , true);
- 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");
-
- XDocletPreferenceStore.setPropertyActive(XDOCLETBUILDERACTIVE , true);
- XDocletPreferenceStore.setPropertyActive(EJB_JONAS , false);
- XDocletPreferenceStore.setPropertyActive(EJB_WEBSPHERE , false);
- XDocletPreferenceStore.setPropertyActive(EJB_WEBLOGIC , false);
- XDocletPreferenceStore.setPropertyActive(EJB_ORACLE , false);
- XDocletPreferenceStore.setPropertyActive(EJB_ORION , false);
- XDocletPreferenceStore.setPropertyActive(EJB_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 86e093c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletRuntime.java
+++ /dev/null
@@ -1,196 +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.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" } }
-
- };
-
- /**
- * @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 cd3e1b4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletWebAntProjectBuilder.java
+++ /dev/null
@@ -1,148 +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.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.util.URI;
-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.modulecore.util.WebArtifactEdit;
-import org.eclipse.wst.common.componentcore.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.ComponentResource;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-
-public class XDocletWebAntProjectBuilder extends XDocletAntProjectBuilder {
-
- 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$
- 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;
- URI sourcePath = URI.createPlatformResourceURI(resource.getFullPath().toString());
- ComponentResource[] moduleResources = moduleCore.findResourcesBySourcePath(sourcePath);
- for (int i = 0; i < moduleResources.length; i++) {
- ComponentResource moduleResource = moduleResources[i];
- if (moduleResource != null)
- wbModule = moduleResource.getComponent();
- if (wbModule != null)
- break;
- }
- webEdit = WebArtifactEdit.getWebArtifactEditForRead(wbModule);
- int j2eeVersion = 0;
- String contextRoot = ""; //$NON-NLS-1$
- if (webEdit != null) {
- j2eeVersion = webEdit.getJ2EEVersion();
- //TODO
- //contextRoot = webEdit.getServerContextRoot();
- contextRoot = wbModule.getName();
- }
-
- properties.put("web.module.webinf", getWebInfFolder(javaProject).getProjectRelativePath().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);
- }
- }
-}
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 09b7b23..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.JLS2);
- 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.JLS2);
- 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.JLS2);
- 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/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 8745d91..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,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.annotations.internal.xdoclet.ui;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-
-
-public class DialogPanel extends Composite {
-
- public Control preferences[] = null;
-
- public Button fActive[] = null;
-
- public DialogPanel(Composite parent, int style) {
- super(parent, style);
- }
-
- public Text createLabeledText(int i, boolean checked, String title,
- String tip, String value, Composite defPanel) {
- return this.createLabeledText(i, true, checked, title, tip, value,
- defPanel);
- }
-
- public Text createLabeledText(int i, boolean addActiveButton,
- boolean checked, String title, String tip, String value,
- Composite defPanel) {
- GridData gridData;
- Label label = new Label(defPanel, SWT.WRAP);
- gridData = new GridData();
- label.setLayoutData(gridData);
- label.setText(title);
- label.setToolTipText(tip);
-
- if (addActiveButton) {
- Button fButton = new Button(defPanel, SWT.CHECK);
-
- gridData = new GridData(GridData.BEGINNING);
- gridData.horizontalSpan = 1;
- fButton.setLayoutData(gridData);
- fButton.setSelection(checked);
- fActive[i] = fButton;
- }
- Text fText = new Text(defPanel, SWT.SHADOW_IN | SWT.BORDER);
- gridData = new GridData(GridData.FILL_HORIZONTAL
- | GridData.GRAB_HORIZONTAL);
- gridData.horizontalSpan = (addActiveButton ? 2 : 3);
- fText.setLayoutData(gridData);
- fText.setText(value);
- fText.setToolTipText(tip);
- return fText;
- }
-
- public Button createLabeledCheck(int i, boolean checked, String title,
- String tip, boolean value, Composite defPanel) {
- return createLabeledCheck(i, true, checked, title, tip, value, defPanel);
- }
-
- public Button createLabeledCheck(int i, boolean addActiveButton,
- boolean checked, String title, String tip, boolean value,
- Composite defPanel) {
- GridData gridData;
- Label label = new Label(defPanel, SWT.WRAP);
- gridData = new GridData();
- label.setLayoutData(gridData);
- label.setText(title);
- label.setToolTipText(tip);
-
- Button fButton = new Button(defPanel, SWT.CHECK);
- gridData = new GridData();
- gridData.horizontalSpan = 3;
- fButton.setLayoutData(gridData);
- fButton.setSelection(value);
- fButton.setToolTipText(tip);
- fButton.setSelection(checked);
- fActive[i] = fButton;
- return fButton;
- }
-
- public Combo createLabeledCombo(int itemI, boolean checked, String title,
- String tip, String value, String[] choices, Composite defPanel) {
-
- return createLabeledCombo(itemI, true, checked, title, tip, value,
- choices, defPanel);
- }
-
- public Combo createLabeledCombo(int itemI, boolean addActiveButton,
- boolean checked, String title, String tip, String value,
- String[] choices, Composite defPanel) {
-
- GridData gridData;
- Label label = new Label(defPanel, SWT.WRAP);
- gridData = new GridData();
- label.setLayoutData(gridData);
- label.setText(title);
- label.setToolTipText(tip);
-
- if (addActiveButton) {
- Button fButton = new Button(defPanel, SWT.CHECK);
- gridData = new GridData();
- gridData.horizontalSpan = 1;
- fButton.setLayoutData(gridData);
- fButton.setSelection(checked);
- fActive[itemI] = fButton;
- }
-
- Combo fCombo = new Combo(defPanel, SWT.BORDER);
- gridData = new GridData(GridData.FILL_HORIZONTAL
- | GridData.GRAB_HORIZONTAL);
- gridData.horizontalSpan = (addActiveButton ? 2 : 3);
- fCombo.setLayoutData(gridData);
- fCombo.setToolTipText(tip);
- int selected = 0;
- for (int i = 0; i < choices.length; i++) {
- String item = choices[i];
- if (value.equals(item))
- selected = i;
- fCombo.add(item);
- }
- fCombo.select(selected);
- return fCombo;
- }
-
- public Text createLabeledPath(int i, boolean checked, String title,
- String tip, String value, Composite defPanel) {
- GridData gridData;
- Label label = new Label(defPanel, SWT.WRAP);
- gridData = new GridData();
- // gridData.horizontalSpan = 1;
- label.setLayoutData(gridData);
- label.setText(title);
-
- final Text fText = new Text(defPanel, SWT.SHADOW_IN | SWT.BORDER);
- gridData = new GridData(GridData.FILL_HORIZONTAL
- | GridData.GRAB_HORIZONTAL);
- gridData.horizontalSpan = 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.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 27e6931..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,161 +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.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 final String[][] ejboptions={
- { XDocletPreferenceStore.EJB_JBOSS, "JBoss", " Creates jboss.xml, jaws.xml and/or jbosscmp-jdbc.xml deployment descriptors for 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", " Generates the deployment descriptor for JOnAS.", "CHECK","2.3,2.4,2.5,2.6,3.0","2.6"},
- { XDocletPreferenceStore.EJB_WEBLOGIC, "WebLogic", "This task can generate deployment descriptors for WLS 6.0, 6.1, 7.0 and 8.1.", "CHECK","6.0,6.1,7.0,8.1","6.1" },
- { XDocletPreferenceStore.EJB_WEBSPHERE, "WebSphere", "This task can generate deployment descriptors for WAS", "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("Set EJB Doclet Preferences (choose the servers to generate specific deployment descriptors)");
-
- 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 2285d4e..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,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003,2004,2005 Eteration Bilisim A.S.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Eteration Bilisim A.S. - initial API and implementation
- * Naci Dai
- * For more information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-package org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.ui;
-
-
-
-import org.eclipse.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);
-
-
-
- Label label = new Label(defPanel, SWT.WRAP);
- gridData = new GridData();
- gridData.horizontalSpan = 4;
- label.setLayoutData(gridData);
- label.setText("Set XDoclet Runtime Preferences");
-
- panel.preferences = new Control[3];
- panel.fActive = new Button[3];
- panel.preferences[0] = panel.createLabeledCheck(0,false,XDocletPreferenceStore.isPropertyActive(XDocletPreferenceStore.XDOCLETBUILDERACTIVE),"Enable XDoclet Builder:","Enables xdoclet builder for automatic generation of java classes",XDocletPreferenceStore.isPropertyActive(XDocletPreferenceStore.XDOCLETBUILDERACTIVE),defPanel);
- panel.preferences[1] = panel.createLabeledCombo(1,false,true,"Version:","XDoclet version",XDocletPreferenceStore.getProperty(XDocletPreferenceStore.XDOCLETVERSION),new String[]{"1.2.1","1.2.2"},defPanel);
- panel.preferences[2] = panel.createLabeledPath(2,true,"XDoclet Home:","The path of the xdoclet runtime installation",XDocletPreferenceStore.getProperty(XDocletPreferenceStore.XDOCLETHOME),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()));
- 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;
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.PreferencePage#isValid()
- */
- public boolean isValid() {
- XDocletRuntime runtime = new XDocletRuntime();
- Text xdocletPath = (Text)panel.preferences[2];
- Combo xdocletVersion = (Combo)panel.preferences[1];
- runtime.setHome(xdocletPath.getText());
- IStatus []result = runtime.validate(xdocletVersion.getItem(xdocletVersion.getSelectionIndex()));
- return result.length == 0;
- }
-
- public boolean performOk() {
-
- String itemValue = "";
- itemValue = ((Text)panel.preferences[2]).getText();
- XDocletPreferenceStore.setProperty(XDocletPreferenceStore.XDOCLETHOME,itemValue);
-
- Combo combo = ((Combo)panel.preferences[1]);
- itemValue = combo.getItem(combo.getSelectionIndex());
- XDocletPreferenceStore.setProperty(XDocletPreferenceStore.XDOCLETVERSION,itemValue);
-
- 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/templates/builder/xdoclet.xml b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/builder/xdoclet.xml
deleted file mode 100644
index 532b4c9..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/builder/xdoclet.xml
+++ /dev/null
@@ -1,108 +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/>
-
- <deploymentdescriptor
- destdir="${ejb.dd.dir}"
- validatexml="false"
- mergedir="${ejb.dd.dir}"
- />
-
- @jboss@
- @jonas@
- @weblogic@
- @websphere@
-
-
- </ejbdoclet>
- </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 653252d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/builder/xdocletweb.xml
+++ /dev/null
@@ -1,79 +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>
- </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 383512d..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.annotations.internal.emitter.model.*"%>
-<% IMessageDrivenBeanDelegate mdb = (IMessageDrivenBeanDelegate)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 c8e1875..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.annotations.internal.emitter.model.*"%>
-
-<% IMessageDrivenBeanDelegate mdb = (IMessageDrivenBeanDelegate)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 c871297..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/message/typeComment.javajet
+++ /dev/null
@@ -1,18 +0,0 @@
-<%@ jet package="org.eclipse.gmf.templates.messageDriven" class="TypeCommentGenerator" imports="java.util.* org.eclipse.jst.j2ee.ejb.annotations.internal.emitter.model.*"%>
-<% IMessageDrivenBeanDelegate mdb = (IMessageDrivenBeanDelegate)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() %>"
-
- * <!-- 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 6c315a5..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.annotations.internal.emitter.model.*"%>
-<% IMessageDrivenBeanDelegate mdb = (IMessageDrivenBeanDelegate)argument; %>
-
-public abstract 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 28bc115..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.annotations.internal.emitter.model.*"%>
-<% ISessionBeanDelegate session = (ISessionBeanDelegate)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 e4f21e1..0000000
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/templates/ejb/session/methodStubs.javajet
+++ /dev/null
@@ -1,16 +0,0 @@
-<%@ jet package="org.eclipse.jst.j2ee.ejb.gmf.templates.session" class="MethodGenerator" imports="java.util.* org.eclipse.jst.j2ee.ejb.annotations.internal.emitter.model.*"%>
-<% ISessionBeanDelegate session = (ISessionBeanDelegate)argument; %>
-
-/**
- *
- * <!-- 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 4ea2228..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.annotations.internal.emitter.model.*"%>
-<% ISessionBeanDelegate session = (ISessionBeanDelegate)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 99554ad..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.annotations.internal.emitter.model.*"%>
-<% ISessionBeanDelegate session = (ISessionBeanDelegate)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
