diff options
16 files changed, 243 insertions, 12 deletions
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarFacetInstallPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarFacetInstallPage.java index 69a8111c6..d2195be52 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarFacetInstallPage.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarFacetInstallPage.java @@ -61,7 +61,7 @@ import org.eclipse.wst.web.ui.internal.wizards.DataModelFacetInstallPage; * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a> */ -public final class EarFacetInstallPage extends DataModelFacetInstallPage implements IEarFacetInstallDataModelProperties { +public class EarFacetInstallPage extends DataModelFacetInstallPage implements IEarFacetInstallDataModelProperties { private Button selectAllButton; private Button deselectAllButton; diff --git a/plugins/org.eclipse.jst.jee.ui/plugin.xml b/plugins/org.eclipse.jst.jee.ui/plugin.xml index 389467754..35c4e128a 100644 --- a/plugins/org.eclipse.jst.jee.ui/plugin.xml +++ b/plugins/org.eclipse.jst.jee.ui/plugin.xml @@ -3,11 +3,17 @@ <plugin> <extension point="org.eclipse.wst.common.project.facet.ui.wizardPages"> <wizard-pages action="jst.ear#5.0#install"> - <page class="org.eclipse.jst.j2ee.ui.project.facet.EarFacetInstallPage"/> + <page class="org.eclipse.jst.jee.ui.project.facet.EarJavaEEFacetInstallPage"/> </wizard-pages> <wizard-pages action="jst.appclient#5.0#install"> - <page class="org.eclipse.jst.j2ee.ui.project.facet.appclient.AppClientFacetInstallPage"/> + <page class="org.eclipse.jst.jee.ui.project.facet.appclient.AppClientJavaEEFacetInstallPage"/> </wizard-pages> + <wizard-pages action="jst.web#2.5#install"> + <page class="org.eclipse.jst.jee.servlet.ui.project.facet.WebJavaEEFacetInstallPage"/> + </wizard-pages> + <wizard-pages action="jst.ejb#3.0#install"> + <page class="org.eclipse.jst.jee.ejb.ui.project.facet.EjbJavaEEFacetInstallPage"/> + </wizard-pages> </extension> diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ejb/ui/project/facet/EjbJavaEEFacetInstallPage.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ejb/ui/project/facet/EjbJavaEEFacetInstallPage.java new file mode 100644 index 000000000..097a3ab08 --- /dev/null +++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ejb/ui/project/facet/EjbJavaEEFacetInstallPage.java @@ -0,0 +1,42 @@ +package org.eclipse.jst.jee.ejb.ui.project.facet; + +/*************************************************************************************************** + * Copyright (c) 2007 IBM Corporation and others. All rights reserved. This program and the + * accompanying materials are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: IBM Corporation - initial API and implementation + **************************************************************************************************/ + +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 EjbJavaEEFacetInstallPage extends + org.eclipse.jst.ejb.ui.project.facet.EjbFacetInstallPage { + + protected Button addDD; + + public EjbJavaEEFacetInstallPage() { + super(); + } + + protected Composite createTopLevelComposite(Composite parent) { + Composite composite = super.createTopLevelComposite(parent); + createDDSection(composite); + return composite; + } + + private void createDDSection(Composite parent) { + new Label(parent, SWT.NONE); + addDD = new Button(parent, SWT.CHECK); + addDD.setText(Messages.EjbJavaEEFacetInstallPage_0); + synchHelper.synchCheckbox(addDD, GENERATE_DD, null); + GridData gd = new GridData(GridData.FILL_HORIZONTAL); + gd.horizontalSpan = 2; + addDD.setLayoutData(gd); + } +} diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ejb/ui/project/facet/Messages.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ejb/ui/project/facet/Messages.java new file mode 100644 index 000000000..4e283ca7c --- /dev/null +++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ejb/ui/project/facet/Messages.java @@ -0,0 +1,15 @@ +package org.eclipse.jst.jee.ejb.ui.project.facet; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.eclipse.jst.jee.ejb.ui.project.facet.messages"; //$NON-NLS-1$ + public static String EjbJavaEEFacetInstallPage_0; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ejb/ui/project/facet/messages.properties b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ejb/ui/project/facet/messages.properties new file mode 100644 index 000000000..fe4bd3832 --- /dev/null +++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ejb/ui/project/facet/messages.properties @@ -0,0 +1 @@ +EjbJavaEEFacetInstallPage_0=Generate Deployment Descriptor diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/servlet/ui/project/facet/Messages.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/servlet/ui/project/facet/Messages.java new file mode 100644 index 000000000..6f96c514f --- /dev/null +++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/servlet/ui/project/facet/Messages.java @@ -0,0 +1,15 @@ +package org.eclipse.jst.jee.servlet.ui.project.facet; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.eclipse.jst.jee.servlet.ui.project.facet.messages"; //$NON-NLS-1$ + public static String WebJavaEEFacetInstallPage_0; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/servlet/ui/project/facet/WebJavaEEFacetInstallPage.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/servlet/ui/project/facet/WebJavaEEFacetInstallPage.java new file mode 100644 index 000000000..da15d52b4 --- /dev/null +++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/servlet/ui/project/facet/WebJavaEEFacetInstallPage.java @@ -0,0 +1,41 @@ +package org.eclipse.jst.jee.servlet.ui.project.facet; + +/*************************************************************************************************** + * Copyright (c) 2007 IBM Corporation and others. All rights reserved. This program and the + * accompanying materials are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: IBM Corporation - initial API and implementation + **************************************************************************************************/ + +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 WebJavaEEFacetInstallPage extends org.eclipse.jst.servlet.ui.project.facet.WebFacetInstallPage { + + protected Button addDD; + + public WebJavaEEFacetInstallPage() { + super(); + } + + protected Composite createTopLevelComposite(Composite parent) { + Composite composite = super.createTopLevelComposite(parent); + createDDSection(composite); + return composite; + } + + private void createDDSection(Composite parent) { + new Label(parent, SWT.NONE); + addDD = new Button(parent, SWT.CHECK); + addDD.setText(Messages.WebJavaEEFacetInstallPage_0); + synchHelper.synchCheckbox(addDD, GENERATE_DD, null); + GridData gd = new GridData(GridData.FILL_HORIZONTAL); + gd.horizontalSpan = 2; + addDD.setLayoutData(gd); + } +} diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/servlet/ui/project/facet/messages.properties b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/servlet/ui/project/facet/messages.properties new file mode 100644 index 000000000..8110b896c --- /dev/null +++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/servlet/ui/project/facet/messages.properties @@ -0,0 +1 @@ +WebJavaEEFacetInstallPage_0=Generate Deployment Descriptor diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/project/facet/EarJavaEEFacetInstallPage.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/project/facet/EarJavaEEFacetInstallPage.java new file mode 100644 index 000000000..37e1fab8b --- /dev/null +++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/project/facet/EarJavaEEFacetInstallPage.java @@ -0,0 +1,43 @@ +package org.eclipse.jst.jee.ui.project.facet; + +/*************************************************************************************************** + /*************************************************************************************************** + * Copyright (c) 2007 IBM Corporation and others. All rights reserved. This program and the + * accompanying materials are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: IBM Corporation - initial API and implementation + **************************************************************************************************/ + +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 EarJavaEEFacetInstallPage extends + org.eclipse.jst.j2ee.ui.project.facet.EarFacetInstallPage { + + protected Button addDD; + + public EarJavaEEFacetInstallPage() { + super(); + } + + protected Composite createTopLevelComposite(Composite parent) { + Composite composite = super.createTopLevelComposite(parent); + createDDSection(composite); + return composite; + } + + private void createDDSection(Composite parent) { + new Label(parent, SWT.NONE); + addDD = new Button(parent, SWT.CHECK); + addDD.setText(Messages.EarJavaEEFacetInstallPage_0); + synchHelper.synchCheckbox(addDD, GENERATE_DD, null); + GridData gd = new GridData(GridData.FILL_HORIZONTAL); + gd.horizontalSpan = 2; + addDD.setLayoutData(gd); + } +} diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/project/facet/Messages.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/project/facet/Messages.java new file mode 100644 index 000000000..f00412ddb --- /dev/null +++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/project/facet/Messages.java @@ -0,0 +1,15 @@ +package org.eclipse.jst.jee.ui.project.facet; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.eclipse.jst.jee.ui.project.facet.messages"; //$NON-NLS-1$ + public static String EarJavaEEFacetInstallPage_0; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/project/facet/appclient/AppClientJavaEEFacetInstallPage.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/project/facet/appclient/AppClientJavaEEFacetInstallPage.java new file mode 100644 index 000000000..af5247ffa --- /dev/null +++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/project/facet/appclient/AppClientJavaEEFacetInstallPage.java @@ -0,0 +1,43 @@ +package org.eclipse.jst.jee.ui.project.facet.appclient; + +/*************************************************************************************************** + * Copyright (c) 2007 IBM Corporation and others. All rights reserved. This program and the + * accompanying materials are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: IBM Corporation - initial API and implementation + **************************************************************************************************/ + +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 AppClientJavaEEFacetInstallPage + extends + org.eclipse.jst.j2ee.ui.project.facet.appclient.AppClientFacetInstallPage { + + protected Button addDD; + + public AppClientJavaEEFacetInstallPage() { + super(); + } + + protected Composite createTopLevelComposite(Composite parent) { + Composite composite = super.createTopLevelComposite(parent); + createDDSection(composite); + return composite; + } + + private void createDDSection(Composite parent) { + new Label(parent, SWT.NONE); + addDD = new Button(parent, SWT.CHECK); + addDD.setText(Messages.AppClientJavaEEFacetInstallPage_0); + synchHelper.synchCheckbox(addDD, GENERATE_DD, null); + GridData gd = new GridData(GridData.FILL_HORIZONTAL); + gd.horizontalSpan = 2; + addDD.setLayoutData(gd); + } +} diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/project/facet/appclient/Messages.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/project/facet/appclient/Messages.java new file mode 100644 index 000000000..94a92bf5b --- /dev/null +++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/project/facet/appclient/Messages.java @@ -0,0 +1,15 @@ +package org.eclipse.jst.jee.ui.project.facet.appclient; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.eclipse.jst.jee.ui.project.facet.appclient.messages"; //$NON-NLS-1$ + public static String AppClientJavaEEFacetInstallPage_0; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/project/facet/appclient/messages.properties b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/project/facet/appclient/messages.properties new file mode 100644 index 000000000..95f31a6a6 --- /dev/null +++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/project/facet/appclient/messages.properties @@ -0,0 +1 @@ +AppClientJavaEEFacetInstallPage_0=Generate Deployment Descriptor diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/project/facet/messages.properties b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/project/facet/messages.properties new file mode 100644 index 000000000..eed1629ef --- /dev/null +++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/project/facet/messages.properties @@ -0,0 +1 @@ +EarJavaEEFacetInstallPage_0=Generate Deployment Descriptor diff --git a/plugins/org.eclipse.jst.servlet.ui/plugin.xml b/plugins/org.eclipse.jst.servlet.ui/plugin.xml index c2171257c..ae6fe9ccf 100644 --- a/plugins/org.eclipse.jst.servlet.ui/plugin.xml +++ b/plugins/org.eclipse.jst.servlet.ui/plugin.xml @@ -301,14 +301,6 @@ <page class="org.eclipse.jst.servlet.ui.project.facet.WebFacetInstallPage"/> </wizard-pages> </extension> - - <!-- same web facet install page for the new web 2.5 facet --> - <extension point="org.eclipse.wst.common.project.facet.ui.wizardPages"> - <wizard-pages action="jst.web#2.5#install"> - <page class="org.eclipse.jst.servlet.ui.project.facet.WebFacetInstallPage"/> - </wizard-pages> - </extension> - <extension point="org.eclipse.wst.common.project.facet.ui.images"> <image facet="jst.web" path="icons/war.gif"/> diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFacetInstallPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFacetInstallPage.java index 79c2d03dc..ee947a8a9 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFacetInstallPage.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFacetInstallPage.java @@ -27,7 +27,7 @@ import org.eclipse.swt.widgets.Text; /** * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a> */ -public final class WebFacetInstallPage extends J2EEModuleFacetInstallPage implements IWebFacetInstallDataModelProperties { +public class WebFacetInstallPage extends J2EEModuleFacetInstallPage implements IWebFacetInstallDataModelProperties { private Label contextRootLabel; private Text contextRoot; private Label contentDirLabel; |