This commit was manufactured by cvs2svn to create tag 'v201201241607'.
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.classpath b/bundles/org.eclipse.jst.ws.axis.consumption.ui/.classpath
deleted file mode 100644
index 196d49a..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.cvsignore b/bundles/org.eclipse.jst.ws.axis.consumption.ui/.cvsignore
deleted file mode 100644
index 849a03b..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-build.xml
-temp.folder
-wsc-axis-ui.jar
-@dot
-src.zip
-javaCompiler...args
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.project b/bundles/org.eclipse.jst.ws.axis.consumption.ui/.project
deleted file mode 100644
index 12dac85..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.axis.consumption.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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.axis.consumption.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f9b73ed..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Thu May 31 13:10:18 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.jst.ws.axis.consumption.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index a2bb559..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 30 10:41:34 EST 2006
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index bf38402..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,49 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.axis.consumption.ui; singleton:=true
-Bundle-Version: 1.0.505.qualifier
-Bundle-Activator: org.eclipse.jst.ws.internal.axis.consumption.ui.plugin.WebServiceAxisConsumptionUIPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.axis.consumption.ui;x-internal:=true,
- org.eclipse.jst.ws.internal.axis.consumption.ui.command;x-internal:=true,
- org.eclipse.jst.ws.internal.axis.consumption.ui.plugin;x-internal:=true,
- org.eclipse.jst.ws.internal.axis.consumption.ui.task;x-internal:=true,
- org.eclipse.jst.ws.internal.axis.consumption.ui.util;x-internal:=true,
- org.eclipse.jst.ws.internal.axis.consumption.ui.widgets;x-internal:=true,
- org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client;x-internal:=true,
- org.eclipse.jst.ws.internal.axis.consumption.ui.wsrt;x-internal:=true
-Import-Package: com.ibm.icu.text; version="3.8",
- com.ibm.icu.util; version="3.8"
-Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.common;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jem;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.wst.ws.parser;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.jst.ws.consumption.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.ws;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.jst.ws.axis.consumption.core;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.jst.ws.ui;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.jst.ws.consumption;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.command.env.core;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.wst.command.env;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.wst.command.env.ui;bundle-version="[1.0.101,1.2.0)",
- org.eclipse.wst.server.core;bundle-version="[1.0.102,2.0.0)",
- org.eclipse.wst.wsdl;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.wst.ws;bundle-version="[1.0.100,1.2.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,2.0.0)",
- javax.wsdl;bundle-version="[1.5.0,1.6.0)",
- org.apache.axis;bundle-version="[1.4.0,1.5.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/about.html b/bundles/org.eclipse.jst.ws.axis.consumption.ui/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/build.properties b/bundles/org.eclipse.jst.ws.axis.consumption.ui/build.properties
deleted file mode 100644
index c772b64..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-bin.includes = .,\
- plugin.properties,\
- plugin.xml,\
- META-INF/,\
- about.html
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.properties b/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.properties
deleted file mode 100644
index 320bc0f..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Webservice Axis Consumption UI
-PLUGIN_PROVIDER=Eclipse Web Tools Platform
-
-WEBSERVICECLIENTTYPE_NAME_JAVA_AXIS=Java proxy
-LABEL_RUNTIME_AXIS_11=Apache Axis
-DESC_RUNTIME_AXIS_11=Apache Axis
-#
-# Web Services Preferance Pages
-#
-# Categories
-PREFERENCE_CATEGORY_AXIS_EMITTER=Axis Emitter
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.xml b/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.xml
deleted file mode 100644
index 79917a4..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
- <extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
- <widgetFactory
- id="AxisClientConfig"
- insertBeforeCommandId="org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand"
- class="org.eclipse.jst.ws.internal.axis.consumption.ui.wsrt.AxisClientConfigWidgetFactory"/>
- </extension>
- <extension
- point="org.eclipse.wst.command.env.antDataMapping">
- <map
- key="ClientProjectName"
- operation="org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientDefaultingCommand"
- property="ClientProject"
- transform="org.eclipse.jst.ws.internal.common.StringToIProjectTransformer"/>
- <map
- key="CustomizeClientMappings"
- operation="org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientDefaultingCommand"
- property="CustomizeClientMappings"
- transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
- <map
- key="Mappings"
- operation="org.eclipse.jst.ws.internal.axis.consumption.ui.task.ClientCodeGenOperation"
- property="JavaWSDLParam"
- transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
- </extension>
- <extension
- point="org.eclipse.ui.preferencePages">
- <page
- name="%PREFERENCE_CATEGORY_AXIS_EMITTER"
- category="org.eclipse.wst.ws.internal.ui.preferences.name"
- class="org.eclipse.jst.ws.internal.axis.consumption.ui.preferences.AxisEmitterPreferencePage"
- id="org.eclipse.jst.ws.internal.axis.consumption.ui.preferences.AxisEmitterPreferencePage">
- </page>
-
- </extension>
-</plugin>
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/AxisConsumptionUI.properties b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/AxisConsumptionUI.properties
deleted file mode 100644
index e8aa870..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/AxisConsumptionUI.properties
+++ /dev/null
@@ -1,106 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-# yyyymmdd bug Email and other contact information
-# -------- -------- -----------------------------------------------------------
-# 20060216 126989 pmoogk@ca.ibm.com - Peter Moogk
-# 20060329 127016 andyzhai@ca.ibm.com - Andy Zhai
-# 20060424 120137 kathy@ca.ibm.com - Kathy Chan
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-
-MSG_ERROR_DEFAULT_BEAN=IWAB0491E Error encountered while setting up default values for Java bean
-MSG_ERROR_WSDL_NO_DEFINITION=IWAB0495E WSDL file at {0} has no definition element
-MSG_ERROR_WSDL_NO_PORT=IWAB0496E WSDL file at {0} has no port element
-MSG_ERROR_WRITE_WSDL=IWAB0497E Error in writing WSDL file {0}
-
-#
-# Messages for CopyClientWSDLTask
-#
-MSG_ERROR_IMPORT_WSDL=IWAB0531E Error in resolving WSDL file {0}, import WSDL file must have absolute URL or relative URL in the same directory
-
-
-#
-#DefaultsForClientJavaWSDLCommand
-#
-MSG_ERROR_WSDL_LOCATION_NOT_SET=IWAB0501E WSDL location not set.
-
-#
-#AddJarsToProjectBuildPathTask
-#
-MSG_WARN_NO_JAVA_NATURE=IWAB0502W The project is not a Java project.
-MSG_ERROR_BAD_BUILDPATH=IWAB0503E Unable to update Java build path. Please check your system environment.
-
-#
-#CopyAxisJarCommand
-#
-PROGRESS_INFO_COPY_AXIS_CFG=IWAB0505I Copying Axis jar files to web project.
-MSG_ERROR_FILECOPY=IWAB0506E Error when copying Axis jar files to web project
-
-#
-#RefreshProjectTask
-#
-MSG_ERROR_REFRESH_PROJECT=IWAB0508E Unable to refresh project.
-
-#
-#WebServiceAxisProxyPage
-#
-TOOLTIP_PWJB_PAGE=Page
-TOOLTIP_PWJB_TEXT_FOLDER=Folder for proxy to be generated for the selected binding.
-TOOLTIP_PWJB_CHECKBOX_GENPROXY=Check to enable/disable the generation of a proxy.
-
-PAGE_TITLE_WS_AXIS_PROXY=Web Service Proxy Page
-PAGE_DESC_WS_AXIS_PROXY=Select generate proxy if you want to generate proxy for your service.
-CHECKBOX_GENPROXY=Generate proxy
-LABEL_FOLDER_NAME=Output folder
-
-#
-# Messages for WebSerivceAxisMappingsPage
-#
-PAGE_TITLE_WS_BEAN2XML=Web Service Package to Namespace Mapping
-PAGE_TITLE_WS_XML2PROXY=Web Service Client Namespace to Package Mapping
-PAGE_DESC_P2N_MAPPINGS=Define custom mapping for package to namespace.
-
-
-LABEL_MAPPING_PAIRS=Mapping pairs
-TABLE_COLUMN_LABEL_PACKAGE=package
-TABLE_COLUMN_LABEL_NAMESPACE=namespace
-LABEL_EXPLORE_MAPPINGS_XML2BEAN=Define custom mapping for namespace to package.
-TOOLTIP_N2P_SHOW_MAPPINGS=Define namespace to package mapping for customization.
-
-# Messages for Axis Emitter Preference Page
-TOOLTIP_PPAE_PAGE=Set preferences that control Axis Emitter.
-TOOLTIP_PPAE_CHECKBOX_ALL_WANTED=By default, code is generated only for referenced elements. \nCall bGenerateAll(true) and WSDL2Java will generate code \nfor all elements in the scope regardless of whether they are referenced. \nScope means: by default, all WSDL files; if generateImports(false),\nthen only the immediate WSDL file.
-TOOLTIP_PPAE_CHECKBOX_HELPER_WANTED=Emits separate Helper classes for meta data.
-TOOLTIP_PPAE_CHECKBOX_WRAP_ARRAYS=Prefers building beans to straight arrays for wrapped XML array types.
-TOOLTIP_PPAE_CHECKBOX_USE_INHERITED_METHODS=If this option is selected, the Java2WSDL parser will look into extended classes to determine the list of methods to export into the WSDL file.
-TOOLTIP_PPAE_CHECKBOX_VALIDATE_AGAINST_JAXRPC=If selected, the tools will examine the Java service class and its value types to determine if it satisfies important requirements of the JAX-RPC specification.
-TOOLTIP_PPAE_COMBO_DEPLOY_SCOPE=Add scope to deploy.wsdd.
-TOOLTIP_PPAE_FIELD_TIME_OUT=Timeout in seconds (default is 45, specify -1 to disable).
-TOOLTIP_PPAE_GROUP_WSDL2JAVA=Set preferences for wsdl2java.
-TOOLTIP_PPAE_GROUP_JAVA2WSDL=Set preferences for java2wsdl.
-BUTTON_ALL_WANTED=&Generate code for all elements, even unreferenced ones
-BUTTON_HELPER_WANTED=Emits separate &helper classes for meta data
-BUTTON_WRAP_ARRAYS=Prefers building beans to straight arrays for &wrapped XML array types
-BUTTON_USE_INHERITED_METHODS=Look for allowed &methods in inherited class
-BUTTON_VALIDATE_AGAINST_JAXRPC=Analyze the service class for compliance to JAX-RPC before generating code
-LABEL_DEPLOY_SCOPE=Add &scope to deploy.wsdd:
-LABEL_TIME_OUT=&Timeout in seconds:
-GROUP_WSDL2JAVA_NAME=Wsdl2Java
-GROUP_JAVA2WSDL_NAME=Java2Wsdl
-DEPLOY_SCOPE_APPLICATION=Application
-DEPLOY_SCOPE_REQUEST=Request
-DEPLOY_SCOPE_SESSION=Session
-MSG_ERROR_INVALID_TIME_OUT=Invalid timeout! Timeout should be positive integer or -1 to disable.
-MSG_USE_JVM_ARGUMENT_FOR_TIME_OUT=Using timeout value (in milliseconds) from JVM arguments AxisWsdl2JavaTimeout
-
-
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/AxisConsumptionUIMessages.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/AxisConsumptionUIMessages.java
deleted file mode 100644
index 6f4038e..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/AxisConsumptionUIMessages.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * yyyymmdd bug Email and other contact information
- * 20060329 127016 andyzhai@ca.ibm.com - Andy Zhai
- * 20060424 120137 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class AxisConsumptionUIMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUI";//$NON-NLS-1$
-
- private AxisConsumptionUIMessages() {
- // Do not instantiate
- }
-
- public static String MSG_ERROR_DEFAULT_BEAN;
- public static String MSG_ERROR_WSDL_NO_DEFINITION;
- public static String MSG_ERROR_WSDL_NO_PORT;
- public static String MSG_ERROR_WRITE_WSDL;
- public static String MSG_ERROR_IMPORT_WSDL;
- public static String MSG_ERROR_WSDL_LOCATION_NOT_SET;
- public static String MSG_WARN_NO_JAVA_NATURE;
- public static String MSG_ERROR_BAD_BUILDPATH;
- public static String PROGRESS_INFO_COPY_AXIS_CFG;
- public static String MSG_ERROR_FILECOPY;
- public static String MSG_ERROR_REFRESH_PROJECT;
- public static String TOOLTIP_PWJB_PAGE;
- public static String TOOLTIP_PWJB_TEXT_FOLDER;
- public static String TOOLTIP_PWJB_CHECKBOX_GENPROXY;
- public static String PAGE_TITLE_WS_AXIS_PROXY;
- public static String PAGE_DESC_WS_AXIS_PROXY;
- public static String CHECKBOX_GENPROXY;
- public static String LABEL_FOLDER_NAME;
- public static String PAGE_TITLE_WS_BEAN2XML;
- public static String PAGE_TITLE_WS_XML2PROXY;
- public static String PAGE_DESC_P2N_MAPPINGS;
- public static String LABEL_MAPPING_PAIRS;
- public static String TABLE_COLUMN_LABEL_PACKAGE;
- public static String TABLE_COLUMN_LABEL_NAMESPACE;
- public static String LABEL_EXPLORE_MAPPINGS_XML2BEAN;
- public static String TOOLTIP_N2P_SHOW_MAPPINGS;
- public static String TOOLTIP_PPAE_PAGE;
- public static String TOOLTIP_PPAE_CHECKBOX_ALL_WANTED;
- public static String TOOLTIP_PPAE_CHECKBOX_HELPER_WANTED;
- public static String TOOLTIP_PPAE_CHECKBOX_WRAP_ARRAYS;
- public static String TOOLTIP_PPAE_CHECKBOX_USE_INHERITED_METHODS;
- public static String TOOLTIP_PPAE_CHECKBOX_VALIDATE_AGAINST_JAXRPC;
- public static String TOOLTIP_PPAE_COMBO_DEPLOY_SCOPE;
- public static String TOOLTIP_PPAE_FIELD_TIME_OUT;
- public static String TOOLTIP_PPAE_GROUP_WSDL2JAVA;
- public static String TOOLTIP_PPAE_GROUP_JAVA2WSDL;
- public static String BUTTON_ALL_WANTED;
- public static String BUTTON_HELPER_WANTED;
- public static String BUTTON_WRAP_ARRAYS;
- public static String BUTTON_USE_INHERITED_METHODS;
- public static String BUTTON_VALIDATE_AGAINST_JAXRPC;
- public static String LABEL_DEPLOY_SCOPE;
- public static String LABEL_TIME_OUT;
- public static String GROUP_WSDL2JAVA_NAME;
- public static String GROUP_JAVA2WSDL_NAME;
- public static String DEPLOY_SCOPE_APPLICATION;
- public static String DEPLOY_SCOPE_REQUEST;
- public static String DEPLOY_SCOPE_SESSION;
- public static String MSG_ERROR_INVALID_TIME_OUT;
- public static String MSG_USE_JVM_ARGUMENT_FOR_TIME_OUT;
- static {
- NLS.initializeMessages(BUNDLE_NAME, AxisConsumptionUIMessages.class);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientDefaultingCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientDefaultingCommand.java
deleted file mode 100644
index dd21b83..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientDefaultingCommand.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.command;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.common.WSDLParserFactory;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-/**
- *
- * AxisClientDefaultingCommand
- *
- */
-public class AxisClientDefaultingCommand extends AbstractDataModelOperation
-{
- private boolean isClientScenario_ = true;
- private boolean customizeMappings_ = false;
- private boolean generateProxy_ = true;
- private String clientRuntimeId_;
- private JavaWSDLParameter javaWSDLParam_;
- private IProject proxyProject_ = null;
- private IProject clientProjectEAR_ = null;
- private String wsdlURL_;
- private boolean testProxySelected_;
- private IServer clientExistingServer_;
- private String clientServer_;
- private boolean clientIsExistingServer_;
- private String proxyProjectFolder_;
- private WebServicesParser webServicesParser_;
- public AxisClientDefaultingCommand( )
- {
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IStatus status = Status.OK_STATUS;
-
- clientExistingServer_ = getServerFromServerLabel();
-// if (clientExistingServer_ != null) {
-// //TODO The following line should no longer be necessary.
-// clientExistingServer_.getServerType().getId();
-// } else {
-// //TODO get the factory id for the type.
-// }
- //javaWSDLParam
- javaWSDLParam_ = new JavaWSDLParameter();
-
- // proxyProjectFolber_
-
- webServicesParser_ = WSDLParserFactory.getWSDLParser();
- return status;
- }
-
- public void setClientRuntimeID(String clientRuntimeId) {
- clientRuntimeId_ = clientRuntimeId;
- }
-
- public String getClientRuntimeID() {
- return this.clientRuntimeId_;
- }
-
- /**
- * @return Returns the javaWSDLParam.
- */
- public JavaWSDLParameter getJavaWSDLParam() {
- return javaWSDLParam_;
- }
-
- /**
- * @return Returns the clientProject.
- */
- public IProject getClientProject() {
- return proxyProject_;
- }
-
- /**
- * @param clientProject
- * The clientProject to set.
- */
- public void setClientProject(IProject clientProject) {
- this.proxyProject_ = clientProject;
- }
-
- /**
- * @return Returns the clientProjectEAR.
- */
- public IProject getClientProjectEAR() {
- return clientProjectEAR_;
- }
-
- /**
- * @param clientProjectEAR
- * The clientProjectEAR to set.
- */
- public void setClientProjectEAR(IProject clientProjectEAR) {
- this.clientProjectEAR_ = clientProjectEAR;
- }
-
- /**
- * @return Returns the testProxySelected.
- */
- public boolean getTestProxySelected() {
- return testProxySelected_;
- }
-
- /**
- * @param testProxySelected
- * The testProxySelected to set.
- */
- public void setTestProxySelected(boolean testProxySelected) {
- this.testProxySelected_ = testProxySelected;
- }
-
- /**
- * @return Returns the wsdlURL.
- */
- public String getWsdlURL() {
- return wsdlURL_;
- }
-
- /**
- * @param wsdlURL
- * The wsdlURL to set.
- */
- public void setWsdlURL(String wsdlURL) {
- this.wsdlURL_ = wsdlURL;
- }
-
- /**
- * @return Returns the clientServer.
- */
- public IServer getClientExistingServer() {
- return clientExistingServer_;
- }
-
- /**
- * @param clientServer
- * The clientServer to set.
- */
- public void setClientServer(String clientServer) {
- this.clientServer_ = clientServer;
- }
-
- /**
- * @return Returns the clientIsExistingServer.
- */
- public boolean isClientIsExistingServer() {
- return clientIsExistingServer_;
- }
-
- /**
- * @param clientIsExistingServer
- * The clientIsExistingServer to set.
- */
- public void setClientIsExistingServer(boolean clientIsExistingServer) {
- this.clientIsExistingServer_ = clientIsExistingServer;
- }
-
- public boolean getCustomizeClientMappings() {
- return customizeMappings_;
- }
-
- public void setCustomizeClientMappings(boolean value) {
- customizeMappings_ = value;
- }
-
- private IServer getServerFromServerLabel() {
- if (true)
- // rsk revisit if (clientIsExistingServer_)
- {
- // Maybe this should be in WebServiceServerRuntimeTypeRegistry
- {
- IServer[] servers = ServerCore.getServers();
- if (servers != null && servers.length!=0) {
- for (int i = 0; i < servers.length; i++) {
- IServer server = (IServer) servers[i];
- if ((server.getName()).equals(clientServer_))
- return server;
- }
- }
- }
- //
- } else {
- //TODO create the server
- }
- return null;
- }
- /**
- * @return Returns the proxyProjectFolder.
- */
- public String getProxyProjectFolder() {
- if (proxyProject_!=null) {
- proxyProjectFolder_ = ResourceUtils.getJavaSourceLocation(proxyProject_ ).toString();
- }
- return proxyProjectFolder_;
- }
-
- /**
- * @return Returns the webServicesParser.
- */
- public WebServicesParser getWebServicesParser() {
- return webServicesParser_;
- }
- /**
- * @param webServicesParser The webServicesParser to set.
- */
- public void setWebServicesParser(WebServicesParser webServicesParser) {
- this.webServicesParser_ = webServicesParser;
- }
- /**
- * @return Returns the generateProxy.
- */
- public boolean getGenerateProxy() {
- return generateProxy_;
- }
- /**
- * @param generateProxy The generateProxy to set.
- */
- public void setGenerateProxy(boolean generateProxy) {
- this.generateProxy_ = generateProxy;
- }
-
- /**
- * @return Returns the isClientScenario_.
- */
- public boolean getIsClientScenario()
- {
- return isClientScenario_;
- }
-
- /**
- * @param isClientScenario_ The isClientScenario_ to set.
- */
- public void setIsClientScenario(boolean isClientScenario)
- {
- isClientScenario_ = isClientScenario;
- }
-
- /**
- * @param setEndpointMethod The setEndpointMethod to set.
- */
- public String getSetEndpointMethod()
- {
- return "setEndpoint";
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientInputCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientInputCommand.java
deleted file mode 100644
index 7c9edf1..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientInputCommand.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.command;
-
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient;
-
-
-public class AxisClientInputCommand extends AbstractDataModelOperation {
-
- private IWebServiceClient wsc_;
-
- private String clientProject_ = null;
- private String wsdlURL_;
- private String clientServer_;
- private WebServicesParser webServicesParser_;
-
- /**
- * Default CTOR
- */
- public AxisClientInputCommand() {
- }
-
- public AxisClientInputCommand(IWebServiceClient wsc, IContext context, String project) {
- wsc_ = wsc;
- clientProject_ = project;
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- wsdlURL_ = wsc_.getWebServiceClientInfo().getWsdlURL();
- clientServer_ = wsc_.getWebServiceClientInfo().getServerInstanceId();
-
- return Status.OK_STATUS;
- }
-
- public String getClientServer() {
- return clientServer_;
- }
-
- public String getClientProject() {
- return clientProject_;
- }
-
- public WebServicesParser getWebServicesParser() {
- return webServicesParser_;
- }
-
- public String getWsdlURL() {
- return wsdlURL_;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientOutputCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientOutputCommand.java
deleted file mode 100644
index 9f729fc..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientOutputCommand.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060728 145426 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.command;
-
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient;
-
-
-public class AxisClientOutputCommand extends AbstractDataModelOperation {
-
- private IWebServiceClient wsc_;
- private String proxyBean_;
- private String proxyEndpoint_;
-
- /**
- * Default CTOR
- */
- public AxisClientOutputCommand() {
- }
-
- public AxisClientOutputCommand(IWebServiceClient wsc, IContext context) {
- wsc_ = wsc;
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- wsc_.getWebServiceClientInfo().setImplURL(proxyBean_);
- wsc_.getWebServiceClientInfo().setProxyEndpoint(proxyEndpoint_);
- return Status.OK_STATUS;
- }
-
- public void setProxyBean(String proxyBean) {
- this.proxyBean_ = proxyBean;
- }
-
- public void setProxyEndpoint(String proxyEndpoint) {
- this.proxyEndpoint_ = proxyEndpoint;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/CopyClientWSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/CopyClientWSDLCommand.java
deleted file mode 100644
index 02fa4e7..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/CopyClientWSDLCommand.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070815 188999 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.command;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.Vector;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Import;
-import javax.wsdl.xml.WSDLWriter;
-
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.env.eclipse.BaseEclipseEnvironment;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-/**
- *
- */
-public class CopyClientWSDLCommand extends AbstractDataModelOperation
-{
-
- private String wsdlURL_;
- private String clientWSDLPathName_;
- private WebServicesParser wsParser_;
-
- public CopyClientWSDLCommand()
- {
-
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
- IStatus status = Status.OK_STATUS;
- Definition def = wsParser_.getWSDLDefinition(wsdlURL_);
- if(def==null)
- {
- status = StatusUtils.errorStatus( NLS.bind(AxisConsumptionUIMessages.MSG_ERROR_WSDL_NO_DEFINITION, new String[]{wsdlURL_}));
- env.getStatusHandler().reportError(status);
- return status;
- }
- IPath clientWSDLPath = new Path(clientWSDLPathName_);
- IWorkspaceRoot workspaceRoot = FileResourceUtils.getWorkspaceRoot();
- status = resolveWSDL(workspaceRoot, def, clientWSDLPath, env, monitor);
- return status;
- }
-
- private IStatus resolveWSDL(
- IWorkspaceRoot workspace,
- Definition wsdlDef,
- IPath wsdlPath,
- IEnvironment env,
- IProgressMonitor monitor) {
- try {
- writeWSDLFile(workspace, wsdlDef, wsdlPath, env, monitor);
- Map importDefs = wsdlDef.getImports();
- Set keysSet = importDefs.keySet();
- for (Iterator e = keysSet.iterator(); e.hasNext();) {
- Object keyName = e.next();
- Vector vector = (Vector) importDefs.get(keyName);
- for (int i = 0; i < vector.size(); i++) {
- Import importDef = (Import) vector.get(i);
- Definition def = importDef.getDefinition();
- String newPathString =
- wsdlPath.toString().substring(
- 0,
- wsdlPath.toString().lastIndexOf("/") + 1); //$NON-NLS-1$
- if (isInvalidImportWSDL(importDef.getLocationURI())) {
- return StatusUtils.errorStatus( NLS.bind(AxisConsumptionUIMessages.MSG_ERROR_IMPORT_WSDL,new String[]{importDef.getLocationURI()}));
- }
- IPath newPath =
- new Path(newPathString + importDef.getLocationURI());
- IStatus status = resolveWSDL(workspace, def, newPath, env, monitor);
- if (status != null
- && status.getSeverity() == Status.ERROR) {
- return status;
- }
- }
- }
- } catch (Exception e) {
- return StatusUtils.errorStatus( NLS.bind(AxisConsumptionUIMessages.MSG_ERROR_WRITE_WSDL,new String[] { wsdlPath.toString() }), e);
- }
- return Status.OK_STATUS;
- }
-
- private boolean isInvalidImportWSDL(String wsdlPath) {
-
- // relative url
- if (!wsdlPath.toLowerCase().startsWith("http://")) { //$NON-NLS-1$
-
- if (wsdlPath.indexOf("/") != -1) { //$NON-NLS-1$
- if (!wsdlPath.startsWith("./")) { //$NON-NLS-1$
- return true;
- }
- }
-
- }
- return false;
- }
-
- private void writeWSDLFile(
- IWorkspaceRoot workspace,
- Definition wsdlDef,
- IPath wsdlPath,
- IEnvironment env,
- IProgressMonitor monitor)
- throws Exception {
-
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- //WSDLFactory wsdlFactory = WSDLFactory.newInstance();
- //WSDLWriter wsdlWriter = wsdlFactory.newWSDLWriter();
- WSDLWriter wsdlWriter = (new org.eclipse.wst.wsdl.internal.impl.wsdl4j.WSDLFactoryImpl()).newWSDLWriter();
- wsdlWriter.writeWSDL(wsdlDef, baos);
- byte[] b = baos.toByteArray();
- ByteArrayInputStream bais = new ByteArrayInputStream(b);
-
- ResourceContext context = ((BaseEclipseEnvironment)env).getResourceContext();
-
- FileResourceUtils.createFile(
- context,
- wsdlPath.makeAbsolute(),
- bais,
- monitor,
- env.getStatusHandler());
-
- baos.close();
- bais.close();
-
- }
-
- /**
- * @param clientWSDLPathName_ The clientWSDLPathName_ to set.
- */
- public void setClientWSDLPathName(String clientWSDLPathName)
- {
- this.clientWSDLPathName_ = clientWSDLPathName;
- }
- /**
- * @param wsdlURL_ The wsdlURL_ to set.
- */
- public void setWsdlURL(String wsdlURL)
- {
- this.wsdlURL_ = wsdlURL;
- }
- /**
- * @param wsParser_ The wsParser_ to set.
- */
- public void setWsParser(WebServicesParser wsParser)
- {
- this.wsParser_ = wsParser;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/DefaultsForClientJavaWSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/DefaultsForClientJavaWSDLCommand.java
deleted file mode 100644
index 12c5ec3..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/DefaultsForClientJavaWSDLCommand.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060216 115144 pmoogk@ca.ibm.com - Peter Moogk
- * 20060503 126819 rsinha@ca.ibm.com - Rupam Kuehner
- * 20080122 215866 trungha@ca.ibm.com - Trung Ha
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.command;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.AxisConsumptionCoreMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.PlatformUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class DefaultsForClientJavaWSDLCommand extends AbstractDataModelOperation
-{
- private JavaWSDLParameter javaWSDLParam_;
- private IProject proxyProject_;
- private String WSDLServiceURL_;
- private String WSDLServicePathname_;
- private String outputFolder_;
-
- public DefaultsForClientJavaWSDLCommand()
- {
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable adaptable)
- {
- IEnvironment environment = getEnvironment();
- IStatus status;
-
- if( outputFolder_ == null )
- {
- IPath[] paths = ResourceUtils.getAllJavaSourceLocations(proxyProject_);
- outputFolder_ = paths[0].toString();
- }
-
- if (javaWSDLParam_ == null)
- {
- status = StatusUtils
- .errorStatus(AxisConsumptionCoreMessages.MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET);
- environment.getStatusHandler().reportError(status);
- return status;
- }
- javaWSDLParam_.setMetaInfOnly(false);
- javaWSDLParam_.setServerSide(JavaWSDLParameter.SERVER_SIDE_NONE);
- ModuleCoreNature mn = ModuleCoreNature.getModuleCoreNature(proxyProject_);
- if (mn != null)
- {
- IPath webModuleServerRoot = ResourceUtils.getJavaSourceLocation(proxyProject_);
- // String output = PlatformUtils.getPlatformURL(webModuleServerRoot);
- String output = ResourceUtils.findResource(webModuleServerRoot).getLocation().toString();
- // String output =
- // ResourceUtils.getWorkspaceRoot().getFolder(webModuleServerRoot).getLocation().toString();
- IPath javaOutput = ResourceUtils.findResource( new Path( outputFolder_ )).getLocation();
- javaWSDLParam_.setJavaOutput(javaOutput.toString());
-
-
- IPath webModulePath = ResourceUtils.getWebComponentServerRootPath(proxyProject_);
- // output = PlatformUtils.getPlatformURL(webModulePath);
- IResource res = ResourceUtils.findResource(webModulePath);
- if (res != null) {
- output = res.getLocation().toString();
- }
- javaWSDLParam_.setOutput(output);
- }
- else
- {
- // Check if it's a plain old Java project
- if (ResourceUtils.isJavaProject(proxyProject_))
- {
- IPath output = ResourceUtils.findResource( new Path( outputFolder_ )).getLocation();
- javaWSDLParam_.setJavaOutput(output.toString());
- javaWSDLParam_.setOutput(output.toString());
- }
- else
- {
- // Not familiar with this kind of project
- status = StatusUtils.errorStatus(AxisConsumptionUIMessages.MSG_WARN_NO_JAVA_NATURE);
- environment.getStatusHandler().reportError(status);
- return status;
- }
- }
- if (WSDLServicePathname_ == null)
- {
- if (WSDLServiceURL_ == null)
- {
- status = StatusUtils.errorStatus(AxisConsumptionUIMessages.MSG_ERROR_WSDL_LOCATION_NOT_SET);
- environment.getStatusHandler().reportError(status);
- return status;
- }
- }
- else
- {
- WSDLServiceURL_ = PlatformUtils.getFileFromPlatform(WSDLServicePathname_);
- }
- javaWSDLParam_.setInputWsdlLocation(WSDLServiceURL_);
- return Status.OK_STATUS;
- }
-
- /**
- * Returns the javaWSDLParam.
- *
- * @return JavaWSDLParameter
- */
- public JavaWSDLParameter getJavaWSDLParam()
- {
- return javaWSDLParam_;
- }
-
- /**
- * Sets the javaWSDLParam.
- *
- * @param javaWSDLParam
- * The javaWSDLParam to set
- */
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
- {
- this.javaWSDLParam_ = javaWSDLParam;
- }
-
- /**
- * @param proxyProject_
- * The proxyProject_ to set.
- */
- public void setProxyProject(IProject proxyProject)
- {
- this.proxyProject_ = proxyProject;
- }
-
- /**
- * @param serviceURL_
- * The wSDLServiceURL_ to set.
- */
- public void setWSDLServiceURL(String serviceURL)
- {
- WSDLServiceURL_ = serviceURL;
- }
-
- /**
- * @param servicePathname_
- * The wSDLServicePathname_ to set.
- */
- public void setWSDLServicePathname(String servicePathname)
- {
- WSDLServicePathname_ = servicePathname;
- }
-
- public String getOutputFolder()
- {
- return outputFolder_;
- }
-
- public void setOutputFolder(String outputFolder)
- {
- outputFolder_ = outputFolder;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/plugin/WebServiceAxisConsumptionUIPlugin.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/plugin/WebServiceAxisConsumptionUIPlugin.java
deleted file mode 100644
index 1330bdd..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/plugin/WebServiceAxisConsumptionUIPlugin.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.consumption.ui.plugin;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.ILog;
-import org.osgi.framework.BundleContext;
-
-
-/**
-* This is the plugin class for the Web Services plugin.
-* <p>
-* This plugin contains the graphic user interface to the
-* Web Services runtime found in org.eclipse.jst.ws.
-*/
-public class WebServiceAxisConsumptionUIPlugin extends Plugin
-{
-
- /**
- * The identifier of the descriptor of this plugin in plugin.xml.
- */
- public static final String ID =
- "org.eclipse.jst.ws.axis.consumption.ui";
-
- /**
- * The reference to the singleton instance of this plugin.
- */
- private static WebServiceAxisConsumptionUIPlugin instance_;
- private ILog log_;
-
- /**
- * Constructs a runtime plugin object for this plugin.
- * The "plugin" element in plugin.xml should include the attribute
- * class = "org.eclipse.jst.ws.internal.ui.plugin.WebServicePlugin".
- * @param descriptor The descriptor of this plugin.
- */
- public WebServiceAxisConsumptionUIPlugin() {
- super();
- if (instance_ == null) {
- instance_ = this;
- }
- log_ = EnvironmentService.getEclipseLog();
-
- }
-
- // This method is needed to keep the logging from blowing up.
- public String toString()
- {
- return ID;
- }
-
- /**
- * Returns the singleton instance of this plugin. Equivalent to calling
- * (WebServiceWasConsumptionPlugin)Platform.getPlugin("org.eclipse.jst.ws.was.v5.tp");
- * @return The WebServiceWasConsumptionPlugin singleton.
- */
- static public WebServiceAxisConsumptionUIPlugin getInstance() {
- return instance_;
- }
-
- /**
- * Called once by the platform when this plugin is first loaded.
- * @throws CoreException If this plugin fails to start.
- */
- public void start( BundleContext bundle ) throws CoreException {
- log_.log(ILog.INFO, 5066, this, "start", "Starting plugin org.eclipse.jst.ws.axis.consumption.ui");
-
- try
- {
- super.start( bundle );
- }
- catch( Exception exc )
- {
- log_.log( ILog.ERROR, 5066, this, "start", exc );
- }
- }
-
- /**
- * Called once by the platform when this plugin is unloaded.
- * @throws CoreException If this plugin fails to shutdown.
- */
- public void stop( BundleContext context ) throws CoreException {
- log_.log(ILog.INFO, 5067, this, "shutdown", "Shutting plugin org.eclipse.jst.ws.axis.consumption.ui");
-
- try
- {
- super.stop( context );
- }
- catch( Exception exc )
- {
- log_.log( ILog.ERROR, 5066, this, "stop", exc );
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/preferences/AxisEmitterPreferencePage.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/preferences/AxisEmitterPreferencePage.java
deleted file mode 100644
index c66cc60..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/preferences/AxisEmitterPreferencePage.java
+++ /dev/null
@@ -1,350 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * yyyymmdd bug Email and other contact information
- * 20060329 127016 andyzhai@ca.ibm.com - Andy Zhai
- * 20080428 224726 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.preferences;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.DialogPage;
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jst.ws.internal.axis.consumption.core.context.AxisEmitterContext;
-import org.eclipse.jst.ws.internal.axis.consumption.core.context.AxisEmitterDefaults;
-import org.eclipse.jst.ws.internal.axis.consumption.core.plugin.WebServiceAxisConsumptionCorePlugin;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.plugin.WebServiceAxisConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StackLayout;
-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.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.help.IWorkbenchHelpSystem;
-
-
-
-public class AxisEmitterPreferencePage extends PreferencePage implements IWorkbenchPreferencePage
-{
- /*CONTEXT_ID PPAE0001 for the Axis Emitter Preference Page*/
- private String INFOPOP_PPAE_PAGE = WebServiceAxisConsumptionUIPlugin.ID + ".PPAE0001";
- //
- private Button allWanted;
- /*CONTEXT_ID PPAE0002 for the all wanted check box on the Axis Emitter Preference Page*/
- private String INFOPOP_PPAE_CHECKBOX_ALL_WANTED = "PPAE0002";
- //
- private Button helperWanted;
- /*CONTEXT_ID PPAE0003 for helper wanted check box on the Axis Emitter Preference Page*/
- private String INFOPOP_PPAE_CHECKBOX_HELPER_WANTED = "PPAE0003";
- //
- private Button wrapArrays;
- /*CONTEXT_ID PPAE0004 for the wrap arrays check box on the Axis Emitter Preference Page*/
- private String INFOPOP_PPAE_CHECKBOX_WRAP_ARRAYS = "PPAE0004";
-
- private Combo deployScopeTypes;
- //*CONTEXT_ID PPAE0005 for the deploy scope type combo box on the Axis Emitter page*/
- private String INFOPOP_PPAE_COMBO_DEPLOY_SCOPE = "PPAE0005";
-
- private StackLayout timeOutSubCompositeStackLayout;
-
- private Text timeOutField;
- int timeOut;
- String wsdl2JavaTimeoutProperty = System.getProperty("AxisWsdl2JavaTimeout");
-
- private Text timeOutMsgText;
- /*CONTEXT_ID PPAE0006 for the time out field on the Axis Emitter Preference page*/
- private String INFOPOP_PPAE_FIELD_TIME_OUT = "PPAE0006";
-
- private Button useInheritedMethods;
- /*CONTEXT_ID PPAE0007 for the use inherited methods check box on the Axis Emitter Preference page*/
- private String INFOPOP_PPAE_CHECKBOX_USE_INHERITED_METHODS = "PPAE0007";
-
- private Button validateAgainstJAXRPC;
- /*CONTEXT_ID PPAE0010 for the "validate against JAXRPC..." check box on the Axis Emitter Preference page*/
- private String INFOPOP_PPAE_CHECKBOX_VALIDATE_AGAINST_JAXRPC = "PPAE0010";
-
- /*CONTEXT_ID PPAE0008 for the wsdl2java group on the Axis Emitter Preference page*/
- private String INFOPOP_PPAE_GROUP_WSDL2JAVA = "PPAE0008";
- /*CONTEXT_ID PPAE0009 for the java2wsdl group on the Axis Emitter Preference page*/
- private String INFOPOP_PPAE_GROUP_JAVA2WSDL = "PPAE0009";
-/**
- * Creates preference page controls on demand.
- * @param parent the parent for the preference page
- */
- protected Control createContents(Composite superparent)
- {
- UIUtils utils = new UIUtils( WebServiceAxisConsumptionUIPlugin.ID );
- IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
-
- Composite parent = new Composite( superparent, SWT.NONE );
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- parent.setLayout( layout );
- parent.setToolTipText(AxisConsumptionUIMessages.TOOLTIP_PPAE_PAGE);
- helpSystem.setHelp(parent, INFOPOP_PPAE_PAGE);
- Group wsdl2JavaGroup = utils.createGroup(parent, AxisConsumptionUIMessages.GROUP_WSDL2JAVA_NAME, AxisConsumptionUIMessages.TOOLTIP_PPAE_GROUP_WSDL2JAVA, INFOPOP_PPAE_GROUP_WSDL2JAVA, 2, 10,10);
- allWanted = createCheckBox(wsdl2JavaGroup, AxisConsumptionUIMessages.BUTTON_ALL_WANTED,AxisConsumptionUIMessages.TOOLTIP_PPAE_CHECKBOX_ALL_WANTED,INFOPOP_PPAE_CHECKBOX_ALL_WANTED);
-
- helperWanted = createCheckBox(wsdl2JavaGroup, AxisConsumptionUIMessages.BUTTON_HELPER_WANTED,AxisConsumptionUIMessages.TOOLTIP_PPAE_CHECKBOX_HELPER_WANTED,INFOPOP_PPAE_CHECKBOX_HELPER_WANTED);
-
- wrapArrays = createCheckBox(wsdl2JavaGroup, AxisConsumptionUIMessages.BUTTON_WRAP_ARRAYS,AxisConsumptionUIMessages.TOOLTIP_PPAE_CHECKBOX_WRAP_ARRAYS,INFOPOP_PPAE_CHECKBOX_WRAP_ARRAYS);
-
- deployScopeTypes = utils.createCombo(wsdl2JavaGroup, AxisConsumptionUIMessages.LABEL_DEPLOY_SCOPE, AxisConsumptionUIMessages.TOOLTIP_PPAE_COMBO_DEPLOY_SCOPE, INFOPOP_PPAE_COMBO_DEPLOY_SCOPE, SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY);
- /*
- * Ensure the order is the same as it in the fields for class
- * org.eclipse.jst.ws.internal.axis.consumption.core.context.AxisEmitterContext
- */
- deployScopeTypes.setItems(new String []{AxisConsumptionUIMessages.DEPLOY_SCOPE_APPLICATION, AxisConsumptionUIMessages.DEPLOY_SCOPE_REQUEST,AxisConsumptionUIMessages.DEPLOY_SCOPE_SESSION});
-
- Label timeoutLabel = new Label(wsdl2JavaGroup, SWT.WRAP);
- timeoutLabel.setText(AxisConsumptionUIMessages.LABEL_TIME_OUT);
- timeoutLabel.setToolTipText(AxisConsumptionUIMessages.TOOLTIP_PPAE_FIELD_TIME_OUT);
-
- Composite timeOutSubComposite = utils.createComposite(wsdl2JavaGroup, 1);
- timeOutSubCompositeStackLayout = new StackLayout();
- timeOutSubComposite.setLayout(timeOutSubCompositeStackLayout);
-
- // only one of this is displayed at one time, they share infopop and tooltip text
- timeOutField = createTextField(timeOutSubComposite, null ,AxisConsumptionUIMessages.TOOLTIP_PPAE_FIELD_TIME_OUT,INFOPOP_PPAE_FIELD_TIME_OUT);
- timeOutMsgText = createTextField(timeOutSubComposite, null ,AxisConsumptionUIMessages.TOOLTIP_PPAE_FIELD_TIME_OUT,INFOPOP_PPAE_FIELD_TIME_OUT);
-
- timeOutMsgText.setEditable(false);
-
- Group java2WsdlGroup = utils.createGroup(parent, AxisConsumptionUIMessages.GROUP_JAVA2WSDL_NAME, AxisConsumptionUIMessages.TOOLTIP_PPAE_GROUP_JAVA2WSDL, INFOPOP_PPAE_GROUP_JAVA2WSDL, 2, 10,10);
- useInheritedMethods = createCheckBox(java2WsdlGroup, AxisConsumptionUIMessages.BUTTON_USE_INHERITED_METHODS,AxisConsumptionUIMessages.TOOLTIP_PPAE_CHECKBOX_USE_INHERITED_METHODS,INFOPOP_PPAE_CHECKBOX_USE_INHERITED_METHODS);
- validateAgainstJAXRPC = createCheckBox(java2WsdlGroup, AxisConsumptionUIMessages.BUTTON_VALIDATE_AGAINST_JAXRPC,AxisConsumptionUIMessages.TOOLTIP_PPAE_CHECKBOX_VALIDATE_AGAINST_JAXRPC,INFOPOP_PPAE_CHECKBOX_VALIDATE_AGAINST_JAXRPC);
-
- initializeValues();
- org.eclipse.jface.dialogs.Dialog.applyDialogFont(superparent);
-
- return parent;
- }
-
- /**
- * Creates checkbox with horizontalSpan = 2 in its grid data in order to
- * match the grid layout for combo
- */
- private Button createCheckBox( Composite parent, String labelName, String tooltip, String infopop )
- {
- Button button = new Button( parent, SWT.CHECK );
- button.setText(labelName);
- button.setToolTipText( tooltip );
- if( infopop != null ) PlatformUI.getWorkbench().getHelpSystem().setHelp( button, WebServiceAxisConsumptionUIPlugin.ID + "." + infopop );
- GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
- gd.horizontalSpan= 2;
- button.setLayoutData(gd);
- return button;
- }
-
- private Text createTextField(Composite parent,String labelName, String tooltip, String infopop)
- { tooltip = tooltip == null ? labelName : tooltip;
- if( labelName != null )
- {
- Label label = new Label( parent, SWT.WRAP);
- label.setText( labelName );
- label.setToolTipText( tooltip );
- }
- Text text = new Text(parent, SWT.SINGLE | SWT.BORDER);
- GridData data = new GridData();
- data.verticalAlignment = GridData.FILL;
- data.horizontalAlignment = GridData.FILL;
- data.grabExcessHorizontalSpace = true;
- text.setLayoutData(data);
- text.setToolTipText(tooltip);
- if( infopop != null ) PlatformUI.getWorkbench().getHelpSystem().setHelp( text, WebServiceAxisConsumptionUIPlugin.ID + "." + infopop );
-
- text.addModifyListener( new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- numberFieldChanged((Text) e.widget);
- }
- }
- );
- return text;
- }
-
- /**
- * Does anything necessary because the default button has been pressed.
- */
- protected void performDefaults()
- {
- super.performDefaults();
- initializeDefaults();
- }
-
- /**
- * Do anything necessary because the OK button has been pressed.
- * @return whether it is okay to close the preference page
- */
- public boolean performOk()
- {
- if(validateNumber(timeOutField.getText()).isOK())
- storeValues();
- return true;
- }
-
- protected void performApply()
- {
- performOk();
- }
-
- /**
- * @see IWorkbenchPreferencePage
- */
- public void init(IWorkbench workbench) { }
-
- /**
- * Initializes states of the controls using default values
- * in the preference store.
- */
- private void initializeDefaults()
- {
- allWanted.setSelection( AxisEmitterDefaults.getAllWantedDefault());
- helperWanted.setSelection( AxisEmitterDefaults.getHelperWantedDefault());
- wrapArrays.setSelection( AxisEmitterDefaults.getWrapArraysDefault());
- deployScopeTypes.select(AxisEmitterDefaults.getDeployScopeDefault());
- if (wsdl2JavaTimeoutProperty != null) timeOutField.setText(""+ getTimeOutValueWithProperty());
- else timeOutField.setText("" + AxisEmitterDefaults.getTimeOutDefault());
- useInheritedMethods.setSelection(AxisEmitterDefaults.getUseInheritedMethodsDefault());
- validateAgainstJAXRPC.setSelection(AxisEmitterDefaults.getValidateAgainstJAXRPC());
- }
-
- /**
- * Initializes states of the controls from the preference store.
- */
- private void initializeValues()
- {
- // get the persistent context from the plugin
- AxisEmitterContext context = WebServiceAxisConsumptionCorePlugin.getInstance().getAxisEmitterContext();
- allWanted.setSelection( context.isAllWantedEnabled());
- helperWanted.setSelection( context.isHelperWantedEnabled());
- wrapArrays.setSelection( context.isWrapArraysEnabled());
- deployScopeTypes.select(context.getDeployScopeType());
- useInheritedMethods.setSelection( context.isUseInheritedMethodsEnabled());
- validateAgainstJAXRPC.setSelection( context.isValidateAgainstJAXRPCEnabled() );
- if (wsdl2JavaTimeoutProperty != null)
- { timeOut=getTimeOutValueWithProperty();
- //timeOutField.setEnabled(false);
- timeOutSubCompositeStackLayout.topControl = timeOutMsgText;
- timeOutMsgText.setText(AxisConsumptionUIMessages.MSG_USE_JVM_ARGUMENT_FOR_TIME_OUT);
- }
- else
- {
- timeOut = context.getTimeOut();
- timeOutSubCompositeStackLayout.topControl = timeOutField;
- }
- timeOutField.setText(""+ timeOut);
- }
-
- /**
- * Stores the values of the controls back to the preference store.
- */
- private void storeValues()
- {
- // get the persistent context from the plugin
- AxisEmitterContext context = WebServiceAxisConsumptionCorePlugin.getInstance().getAxisEmitterContext();
- context.setAllWantedEnabled( allWanted.getSelection() );
- context.setHelperWantedEnabled( helperWanted.getSelection() );
- context.setWrapArraysEnabled( wrapArrays.getSelection() );
- context.selectDeployScopeType(deployScopeTypes.getSelectionIndex());
- timeOut = Integer.parseInt(timeOutField.getText().trim());
- context.setTimeOut(timeOut);
- context.setUseInheritedMethodsEnabled( useInheritedMethods.getSelection() );
- context.setValidateAgainstJAXRPCEnabled( validateAgainstJAXRPC.getSelection() );
- }
-
- private void numberFieldChanged(Text textControl) {
- IStatus status = validateNumber(textControl.getText());
- setValid(!status.matches(IStatus.ERROR));
- applyToStatusLine(this,status);
- }
-
- private int getTimeOutValueWithProperty()
- {
- if (wsdl2JavaTimeoutProperty != null)
- { try {
- long timeOutProperty = Long.parseLong(wsdl2JavaTimeoutProperty);
- if (timeOutProperty < 0) return -1; // timeout = -1 equals never time out; treating all negative number as -1
- else return (int)Math.ceil(timeOutProperty/1000.0);
- } catch (NumberFormatException e){
- System.err.print("AxisWSDL2JavaTimeout is not a valid number");
- return AxisEmitterDefaults.getTimeOutDefault();
- }
- }
- else return AxisEmitterDefaults.getTimeOutDefault();
- }
-
- private IStatus validateNumber(String numberString)
- {
- IStatus status;
- try
- {
- int number = Integer.parseInt(numberString);
- if (number <= 0 && number != -1)
- {
- status = new Status(IStatus.ERROR, WebServiceAxisConsumptionUIPlugin.ID, IStatus.ERROR,
- AxisConsumptionUIMessages.MSG_ERROR_INVALID_TIME_OUT, null);
- }
- else
- { timeOut = number;
- status = Status.OK_STATUS;
- //we set param:message="" here, Later in
- //applyToStatusLine(), we do page.setMessage(null,type)
- status = new Status(IStatus.OK, WebServiceAxisConsumptionUIPlugin.ID, IStatus.OK, "",null);
- }
- }
- catch
- (NumberFormatException e)
- {
- status = new Status(IStatus.ERROR, WebServiceAxisConsumptionUIPlugin.ID, IStatus.ERROR,
- AxisConsumptionUIMessages.MSG_ERROR_INVALID_TIME_OUT, null);
- }
- return status;
- }
-
- private void applyToStatusLine(DialogPage page, IStatus status) {
- String message= status.getMessage();
- switch (status.getSeverity()) {
- case IStatus.OK:
- page.setMessage(null, IMessageProvider.NONE);
- page.setErrorMessage(null);
- break;
- case IStatus.WARNING:
- page.setMessage(message, IMessageProvider.WARNING);
- page.setErrorMessage(null);
- break;
- case IStatus.INFO:
- page.setMessage(message, IMessageProvider.INFORMATION);
- page.setErrorMessage(null);
- break;
- default:
- if (message.length() == 0) {
- message= null;
- }
- page.setMessage(null);
- page.setErrorMessage(message);
- break;
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ClientCodeGenOperation.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ClientCodeGenOperation.java
deleted file mode 100644
index f8dcdf1..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ClientCodeGenOperation.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060509 125094 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060515 115225 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060728 145426 kathy@ca.ibm.com - Kathy Chan
- * 20080603 235367 makandre@ca.ibm.com - Andrew Mak, "IWAB0014E Unexpected exception occurred" from ant task for web service client generation
- * 20080626 229867 makandre@ca.ibm.com - Andrew Mak, Missing method in generated proxy class
- * 20080709 240225 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.task;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-public class ClientCodeGenOperation extends AbstractDataModelOperation {
-
- private CopyAxisJarCommand copyAxisJarCommand = null;
-
- private WSDL2JavaCommand wsdl2JavaCommand = null;
- private JavaWSDLParameter javaWSDLParam;
- private String wsdlURI;
-
- private IProject project;
-
- private Stub2BeanCommand stub2BeanCommand = null;
- private WebServicesParser webServicesParser;
- private String outputFolder;
- private String proxyBean;
- private String proxyEndpoint;
-
- private RefreshProjectCommand refreshProjectCommand = null;
-
- public ClientCodeGenOperation(){
- copyAxisJarCommand = new CopyAxisJarCommand();
- wsdl2JavaCommand = new WSDL2JavaCommand();
- stub2BeanCommand = new Stub2BeanCommand();
- refreshProjectCommand = new RefreshProjectCommand();
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) {
-
- IEnvironment env = getEnvironment();
- ClientWSModifyOperation buOperation = new ClientWSModifyOperation(info, env);
- try {
- buOperation.execute(monitor);
- }
- catch(CoreException ce){
- IStatus status = ce.getStatus();
- return status;
- }
- return Status.OK_STATUS;
-
- }
-
-
- private class ClientWSModifyOperation extends WorkspaceModifyOperation {
-
- private IAdaptable info = null;
- private IEnvironment env = null;
-
-
- protected ClientWSModifyOperation(IAdaptable adaptable, IEnvironment environment){
- info = adaptable;
- env = environment;
- }
-
- protected void execute(IProgressMonitor monitor) throws CoreException{
-
- IStatus status = null;
-
- // CopyAxisJarCommand
- copyAxisJarCommand.setEnvironment(env);
- copyAxisJarCommand.setProject(project);
- status = copyAxisJarCommand.execute(monitor, info);
- if (status.getSeverity() == Status.ERROR){
- throw new CoreException(status);
- }
-
- // WSDL2JavaCommand
- wsdl2JavaCommand.setEnvironment(env);
- wsdl2JavaCommand.setJavaWSDLParam(javaWSDLParam);
- wsdl2JavaCommand.setWsdlURI(wsdlURI);
- status = wsdl2JavaCommand.execute(monitor, info);
- if (status.getSeverity() == Status.ERROR) {
- throw new CoreException(status);
- }
-
- // Stub2BeanCommand
- stub2BeanCommand.setEnvironment(env);
- stub2BeanCommand.setWebServicesParser(webServicesParser);
- stub2BeanCommand.setOutputFolder(outputFolder);
- stub2BeanCommand.setJavaWSDLParam(javaWSDLParam);
- stub2BeanCommand.setClientProject(project);
- status = stub2BeanCommand.execute(monitor, info);
- if (status.getSeverity() == Status.ERROR) {
- throw new CoreException(status);
- }
- proxyBean = stub2BeanCommand.getProxyBean();
- proxyEndpoint = stub2BeanCommand.getProxyEndpoint();
-
- // RefreshProjectCommand
- refreshProjectCommand.setEnvironment(env);
- refreshProjectCommand.setProject(project);
- status = refreshProjectCommand.execute(monitor, info);
- if (status.getSeverity() == Status.ERROR) {
- throw new CoreException(status);
- }
-
- }
-
- }
-
- public JavaWSDLParameter getJavaWSDLParam() {
- return javaWSDLParam;
- }
-
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
- this.javaWSDLParam = javaWSDLParam;
- }
-
- public void setOutputFolder(String outputFolder) {
- this.outputFolder = outputFolder;
- }
-
- public void setProject(IProject project) {
- this.project = project;
- }
-
- public void setWebServicesParser(WebServicesParser webServicesParser) {
- this.webServicesParser = webServicesParser;
- }
-
- public void setWsdlURI(String wsdlURI) {
- this.wsdlURI = wsdlURI;
- }
-
- public String getProxyBean() {
- return proxyBean;
- }
-
- public String getProxyEndpoint() {
- return proxyEndpoint;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CopyAxisJarCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CopyAxisJarCommand.java
deleted file mode 100644
index 6758a45..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CopyAxisJarCommand.java
+++ /dev/null
@@ -1,455 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060509 125094 sengpl@ca.ibm.com - Seng Phung-Lu, Use WorkspaceModifyOperation
- * 20060515 115225 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060517 142342 kathy@ca.ibm.com - Kathy Chan
- * 20060828 155439 mahutch@ca.ibm.com - Mark Hutchinson
- * 20070501 184505 kathy@ca.ibm.com - Kathy Chan
- * 20070502 184505 kathy@ca.ibm.com - Kathy Chan, Update JAR sizes
- * 20071102 208620 kathy@ca.ibm.com - Kathy Chan, Update JAR sizes
- * 20071102 202222 kathy@ca.ibm.com - Kathy Chan
- * 20080122 216165 kathy@ca.ibm.com - Kathy Chan
- * 20080326 224148 makandre@ca.ibm.com - Andrew Mak, Web service scenarios broke in latest builds with Equinox p2
- * 20100304 304385 mahutch@ca.ibm.com - Mark Hutchinson, Allow users to disable copying axis jars
- * 20100414 309040 mahutch@ca.ibm.com - Mark Hutchinson, update jar sizes
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.task;
-
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.plugin.WebServiceAxisConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.env.core.common.ProgressUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.env.core.context.TransientResourceContext;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.common.BundleUtils;
-
-
-public class CopyAxisJarCommand extends AbstractDataModelOperation {
-
- public static String AXIS_JAR = "axis.jar"; //$NON-NLS-1$
- public static String AXIS_RUNTIME_PLUGIN_ID = "org.apache.axis"; //$NON-NLS-1$
- public static String COMMON_DISCOVERY_PLUGIN_ID = "org.apache.commons.discovery"; //$NON-NLS-1$
- public static String COMMON_DISCOVERY_JAR = "commons-discovery-0.2.jar"; //$NON-NLS-1$
- public static String JAVAX_XML_RPC_PLUGIN_ID = "javax.xml.rpc"; //$NON-NLS-1$
- public static String JAVAX_XML_RPC_JAR = "jaxrpc.jar"; //$NON-NLS-1$
- public static String JAVAX_XML_SOAP_PLUGIN_ID = "javax.xml.soap"; //$NON-NLS-1$
- public static String JAVAX_XML_SOAP_JAR = "saaj.jar"; //$NON-NLS-1$
- public static String JAVAX_WSDL_PLUGIN_ID = "javax.wsdl"; //$NON-NLS-1$
- public static String JAVAX_WSDL_JAR = "wsdl4j.jar"; //$NON-NLS-1$
- public static String COMMON_LOGGING_PLUGIN_ID = "org.apache.commons.logging"; //$NON-NLS-1$
- public static String COMMON_LOGGING_JAR = "commons-logging.jar"; //$NON-NLS-1$
- private static long AXIS_JAR_SIZE = 1599570L;
- private static long COMMON_DISCOVERY_JAR_SIZE = 71442L;
- private static long JAVAX_XML_RPC_JAR_SIZE = 31191L;
- private static long JAVAX_XML_SOAP_JAR_SIZE = 18979L;
- private static long JAVAX_WSDL_JAR_SIZE = 168178L;
- private static long COMMON_LOGGING_JAR_SIZE = 44210L;
-
-// Web Services Jars Used in previous Versions of WTP but now obsolete
- private static String[] OBSOLETE_JARS = new String[]{"commons-discovery.jar", "commons-logging-1.0.4.jar", "log4j-1.2.4.jar", "log4j-1.2.8.jar", "wsdl4j-1.5.1.jar", "axis-ant.jar"};
-
- public static String PATH_TO_JARS_IN_PLUGIN = "lib/";
-
- private IProject project;
- private Boolean projectRestartRequired_ = Boolean.FALSE;
- private IClasspathEntry[] oldClasspath;
- private ArrayList newJarNamesList = new ArrayList();
-
- /**
- * Default CTOR;
- */
- public CopyAxisJarCommand() {
- }
-
- /**
- * Execute the command
- */
- public IStatus execute(IProgressMonitor monitor, IAdaptable adaptable) {
-
- if (WebServiceAxisConsumptionUIPlugin.getInstance().getPluginPreferences().getBoolean("disableAxisJarCopy")) {
- //IStatus status = new Status(IStatus.WARNING, WebServiceAxisConsumptionUIPlugin.ID,"Copying of Apache Axis Web Services jars has been disabled");
- //WebServiceAxisConsumptionUIPlugin.getInstance().getLog().log(status);
- return Status.OK_STATUS;
- }
-
- IEnvironment env = getEnvironment();
- IStatus status = Status.OK_STATUS;
- ProgressUtils.report(monitor, AxisConsumptionUIMessages.PROGRESS_INFO_COPY_AXIS_CFG);
-
- if (J2EEUtils.isWebComponent(project)) {
- copyAxisJarsToProject(project, status, env, monitor);
- }
- else {
- // Check if it's a plain old Java project
- if (J2EEUtils.isJavaComponent(project)) {
- status = addAxisJarsToBuildPath(project, env, monitor);
- if (status.getSeverity() == Status.ERROR) {
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
- else {
- status = StatusUtils.errorStatus(AxisConsumptionUIMessages.MSG_WARN_NO_JAVA_NATURE);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- }
-
- return status;
-
- }
-
- private void copyAxisJarsToProject(IProject project, IStatus status, IEnvironment env, IProgressMonitor monitor) {
-
- IPath webModulePath = J2EEUtils.getWebContentPath(project);
- if (webModulePath == null) {
- status = StatusUtils.errorStatus(ConsumptionMessages.MSG_ERROR_PROJECT_NOT_FOUND);
- env.getStatusHandler().reportError(status);
- return;
- }
-
- deleteObsoleteJars(webModulePath);
-
-
- copyIFile(AXIS_RUNTIME_PLUGIN_ID, "lib/" + AXIS_JAR, webModulePath, "WEB-INF/lib/" + AXIS_JAR, status, env, monitor);
- if (status.getSeverity() == Status.ERROR) {
- return;
- }
- copyIFile(COMMON_DISCOVERY_PLUGIN_ID, "lib/" + COMMON_DISCOVERY_JAR, webModulePath, "WEB-INF/lib/" + COMMON_DISCOVERY_JAR, status, env, monitor);
- if (status.getSeverity() == Status.ERROR) {
- return;
- }
- copyIFile(JAVAX_XML_RPC_PLUGIN_ID, "lib/" + JAVAX_XML_RPC_JAR, webModulePath, "WEB-INF/lib/" + JAVAX_XML_RPC_JAR, status, env, monitor);
- if (status.getSeverity() == Status.ERROR) {
- return;
- }
- copyIFile(JAVAX_XML_SOAP_PLUGIN_ID, "lib/" + JAVAX_XML_SOAP_JAR, webModulePath, "WEB-INF/lib/" + JAVAX_XML_SOAP_JAR, status, env, monitor);
- if (status.getSeverity() == Status.ERROR) {
- return;
- }
- copyPluginJar(JAVAX_WSDL_PLUGIN_ID, webModulePath, "WEB-INF/lib/" + JAVAX_WSDL_JAR, status, env, monitor);
- if (status.getSeverity() == Status.ERROR) {
- return;
- }
-
- copyPluginJar(COMMON_LOGGING_PLUGIN_ID, webModulePath, "WEB-INF/lib/" + COMMON_LOGGING_JAR, status, env, monitor);
- if (status.getSeverity() == Status.ERROR) {
- return;
- }
- return;
- }
-
- /**
- *
- */
- private void copyIFile(String pluginId, String source, IPath targetPath, String targetFile, IStatus status, IEnvironment env, IProgressMonitor monitor) {
- IPath target = targetPath.append(new Path(targetFile));
- ProgressUtils.report(monitor, ConsumptionMessages.PROGRESS_INFO_COPYING_FILE);
-
- try {
- ResourceContext context = new TransientResourceContext();
- context.setOverwriteFilesEnabled(true);
- context.setCreateFoldersEnabled(true);
- context.setCheckoutFilesEnabled(true);
- URL sourceURL = BundleUtils.getURLFromBundle(pluginId, source);
- IFile resource = ResourceUtils.getWorkspaceRoot().getFile(target);
- if (!resource.exists()) {
- IFile file = FileResourceUtils.createFile(context, target, sourceURL.openStream(), monitor, env.getStatusHandler());
- if ((projectRestartRequired_.booleanValue() == false) && file.exists()) {
- projectRestartRequired_ = Boolean.TRUE;
- }
-
- }
- }
- catch (Exception e) {
- status = StatusUtils.errorStatus(AxisConsumptionUIMessages.MSG_ERROR_FILECOPY, e);
- env.getStatusHandler().reportError(status);
-
- }
- }
-
- /**
- * Copy plugins that has been JARed
- */
- private void copyPluginJar(String pluginId, IPath targetPath, String targetFile, IStatus status, IEnvironment env, IProgressMonitor monitor) {
- IPath target = targetPath.append(new Path(targetFile));
- ProgressUtils.report(monitor, ConsumptionMessages.PROGRESS_INFO_COPYING_FILE);
-
- try {
- ResourceContext context = new TransientResourceContext();
- context.setOverwriteFilesEnabled(true);
- context.setCreateFoldersEnabled(true);
- context.setCheckoutFilesEnabled(true);
-
- File jarFile = FileLocator.getBundleFile(Platform.getBundle(pluginId));
- if (jarFile != null && jarFile.isFile()) {
- IFile resource = ResourceUtils.getWorkspaceRoot().getFile(target);
-
- if (!resource.exists()) {
- InputStream is = new FileInputStream(jarFile);
- IFile file = FileResourceUtils.createFile(context, target, is, monitor, env.getStatusHandler());
- if ((projectRestartRequired_.booleanValue() == false) && file.exists()) {
- projectRestartRequired_ = Boolean.TRUE;
- }
-
- }
- }
- }
- catch (Exception e) {
- status = StatusUtils.errorStatus(AxisConsumptionUIMessages.MSG_ERROR_FILECOPY, e);
- env.getStatusHandler().reportError(status);
-
- }
- }
-
- /*
- * Check for any obsolete Jars in WEB-INF/lib folder Obsolete jars would
- * be found in projects migrated from older versions of WTP
- */
- private void deleteObsoleteJars(IPath webModulePath) {
- // First check for Any jars that have names that are known to be
- // obsolete
- for (int i = 0; i < OBSOLETE_JARS.length; i++) {
- IPath path = webModulePath.append("WEB-INF/lib/" + OBSOLETE_JARS[i]);
-
- IFile resource = ResourceUtils.getWorkspaceRoot().getFile(path);
- if (resource.exists()) {
- deleteResource(resource);
- }
- }
-
- // delete older JARs of the same name
- deleteOldJar(webModulePath.append("WEB-INF/lib/" + AXIS_JAR), AXIS_JAR_SIZE);
- deleteOldJar(webModulePath.append("WEB-INF/lib/" + COMMON_DISCOVERY_JAR), COMMON_DISCOVERY_JAR_SIZE);
- deleteOldJar(webModulePath.append("WEB-INF/lib/" + JAVAX_XML_RPC_JAR), JAVAX_XML_RPC_JAR_SIZE);
- deleteOldJar(webModulePath.append("WEB-INF/lib/" + JAVAX_XML_SOAP_JAR), JAVAX_XML_SOAP_JAR_SIZE);
- deleteOldJar(webModulePath.append("WEB-INF/lib/" + JAVAX_WSDL_JAR), JAVAX_WSDL_JAR_SIZE);
- deleteOldJar(webModulePath.append("WEB-INF/lib/" + COMMON_LOGGING_JAR), COMMON_LOGGING_JAR_SIZE);
-
- }
-
- private void deleteOldJar(IPath jarPath, long jarSize) {
- IFile resource = ResourceUtils.getWorkspaceRoot().getFile(jarPath);
- if (resource.exists()) {
- // calculate the size of the resource by getting the java.io.File
- long fileSize = resource.getLocation().toFile().length();
- if (fileSize != jarSize) {
- deleteResource(resource);
- }
- }
- }
-
- private void deleteResource(IFile resource) { // delete the resource
- try {
- // System.out.println("Obsolete Jar!! " + resource.getName());
- resource.delete(true, null);
- }
- catch (Exception e) { // e.printStackTrace();
- }
- }
-
-
- /**
- * Addes Axis JARs to the build path of Java project
- *
- * @param env
- * @param monitor
- * @return
- */
- public IStatus addAxisJarsToBuildPath(IProject project, IEnvironment env, IProgressMonitor monitor) {
-
- IStatus status;
-
- try {
- getJavaProjectClasspath(env, monitor);
-
- addNewJarEntry(PATH_TO_JARS_IN_PLUGIN + AXIS_JAR, getTheJarPath(AXIS_RUNTIME_PLUGIN_ID, PATH_TO_JARS_IN_PLUGIN + AXIS_JAR));
- addNewJarEntry(PATH_TO_JARS_IN_PLUGIN + COMMON_DISCOVERY_JAR, getTheJarPath(COMMON_DISCOVERY_PLUGIN_ID, PATH_TO_JARS_IN_PLUGIN + COMMON_DISCOVERY_JAR));
- addNewJarEntry(PATH_TO_JARS_IN_PLUGIN + JAVAX_XML_RPC_JAR, getTheJarPath(JAVAX_XML_RPC_PLUGIN_ID, PATH_TO_JARS_IN_PLUGIN + JAVAX_XML_RPC_JAR));
- addNewJarEntry(PATH_TO_JARS_IN_PLUGIN + JAVAX_XML_SOAP_JAR, getTheJarPath(JAVAX_XML_SOAP_PLUGIN_ID, PATH_TO_JARS_IN_PLUGIN + JAVAX_XML_SOAP_JAR));
-
- IPath javaxWsdlJarPath = BundleUtils.getJarredPluginPath(JAVAX_WSDL_PLUGIN_ID);
- if (javaxWsdlJarPath != null) {
- addNewJarEntry(javaxWsdlJarPath.toString(), javaxWsdlJarPath);
- }
-
- IPath commonLoggingJarPath = BundleUtils.getJarredPluginPath(COMMON_LOGGING_PLUGIN_ID);
- if (commonLoggingJarPath != null) {
- addNewJarEntry(commonLoggingJarPath.toString(), commonLoggingJarPath);
- }
- updateClasspath(monitor);
- }
- catch (Exception e) {
- status = StatusUtils.errorStatus(AxisConsumptionUIMessages.MSG_ERROR_BAD_BUILDPATH, e);
- return status;
- }
-
- return Status.OK_STATUS;
- }
-
- /**
- * @param env
- * @param monitor
- * @return The Java project classpath
- * @throws JavaModelException
- */
- private IStatus getJavaProjectClasspath(IEnvironment env, IProgressMonitor monitor) throws JavaModelException {
-
- IStatus status = Status.OK_STATUS;
-
- IJavaProject javaProject_ = null;
- oldClasspath = null;
- javaProject_ = JavaCore.create(project);
-
- oldClasspath = javaProject_.getRawClasspath();
-
- return status;
- }
-
- /**
- * Store new JAR name in newJarNamesList if it's not already on build path
- *
- * @param jarName
- * name of the JAR
- * @param jarPath
- * Absolute path to the JAR
- */
- private void addNewJarEntry(String jarName, IPath jarPath) {
-
- boolean found = false;
- for (int i = 0; i < oldClasspath.length; i++) {
- found = oldClasspath[i].getPath().toString().toLowerCase().endsWith(jarName.toLowerCase());
- if (found) {
- break;
- }
- }
-
- if (!found) {
- newJarNamesList.add(new JarEntry(jarName, jarPath));
- }
-
- }
-
- /**
- * Update the Java project classpath adding classpath from newJarNamesList
- * to oldClasspath
- *
- * @param monitor
- * @return
- * @throws JavaModelException
- */
- private IStatus updateClasspath(IProgressMonitor monitor) throws JavaModelException {
-
- IStatus status = Status.OK_STATUS;
-
- if (newJarNamesList.size() > 0) {
- JarEntry[] newJarEntries = (JarEntry[]) newJarNamesList.toArray(new JarEntry[]{});
-
- IClasspathEntry[] newClasspath = new IClasspathEntry[oldClasspath.length + newJarEntries.length];
- int i = 0;
- // Add oldClasspath entries
- while (i < oldClasspath.length) {
- newClasspath[i] = oldClasspath[i];
- i++;
- }
-
- int m = 0;
- while (i < newClasspath.length) {
- newClasspath[i] = JavaCore.newLibraryEntry(newJarEntries[m].getJarPath(), null, null);
- m++;
- i++;
- }
-
- //
- // Then update the project classpath.
- //
-
- IJavaProject javaProject = JavaCore.create(project);
- javaProject.setRawClasspath(newClasspath, monitor);
-
- }
-
- return status;
-
- }
-
- //
- // Returns the local native pathname of the jar.
- //
- private IPath getTheJarPath(String pluginId, String theJar) throws MalformedURLException, IOException {
- if (pluginId != null) {
- URL localURL = Platform.asLocalURL(BundleUtils.getURLFromBundle(pluginId, theJar));
- return new Path(localURL.getFile());
- }
- else {
- return new Path(theJar);
- }
-
- }
-
- public void setProject(IProject project) {
- this.project = project;
- }
-
- public boolean getProjectRestartRequired() {
- return projectRestartRequired_.booleanValue();
- }
-
- public class JarEntry {
- private String jarName;
- private IPath jarPath;
-
- public JarEntry(String name, IPath path) {
- jarName = name;
- jarPath = path;
- }
-
- public String getJarName() {
- return jarName;
- }
-
- public IPath getJarPath() {
- return jarPath;
- }
-
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/DefaultsForHTTPBasicAuthCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/DefaultsForHTTPBasicAuthCommand.java
deleted file mode 100644
index cfd7895..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/DefaultsForHTTPBasicAuthCommand.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.task;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.consumption.ui.wsil.DialogWWWAuthentication;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WWWAuthenticationException;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServiceEntity;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-
-public class DefaultsForHTTPBasicAuthCommand extends AbstractDataModelOperation
-{
- private WebServicesParser webServicesParser;
- private String wsdlServiceURL;
- private JavaWSDLParameter javaWSDLParam;
-
- public DefaultsForHTTPBasicAuthCommand()
- {
- super();
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- if (wsdlServiceURL != null && wsdlServiceURL.length() > 0)
- {
- if (webServicesParser == null)
- {
- webServicesParser = new WebServicesParserExt();
- //wse.setWSParser(webServicesParser);
- }
- WebServiceEntity wsEntity = webServicesParser.getWebServiceEntityByURI(wsdlServiceURL);
- if (wsEntity == null || !wsEntity.isEntityResolved())
- {
- webServicesParser.setURI(wsdlServiceURL);
- try
- {
- webServicesParser.parse(WebServicesParser.PARSE_NONE);
- }
- catch (WWWAuthenticationException wwwae)
- {
- DialogWWWAuthentication dialog = new DialogWWWAuthentication(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell());
- dialog.handleWWWAuthentication(wwwae);
- String username = dialog.getUsername();
- String password = dialog.getPassword();
- if (username != null && password != null)
- {
- webServicesParser.setHTTPBasicAuthUsername(username);
- webServicesParser.setHTTPBasicAuthPassword(password);
- try
- {
- webServicesParser.parse(WebServicesParser.PARSE_NONE);
- }
- catch (Throwable t)
- {
- }
- webServicesParser.setHTTPBasicAuthUsername(null);
- webServicesParser.setHTTPBasicAuthPassword(null);
- }
- }
- catch (Throwable t)
- {
- }
- wsEntity = webServicesParser.getWebServiceEntityByURI(wsdlServiceURL);
- }
- if (wsEntity != null && wsEntity.getType() == WebServiceEntity.TYPE_WSDL)
- {
- String httpUsername = wsEntity.getHTTPUsername();
- String httpPassword = wsEntity.getHTTPPassword();
- if (httpUsername != null && httpPassword != null)
- {
- javaWSDLParam.setHTTPUsername(httpUsername);
- javaWSDLParam.setHTTPPassword(httpPassword);
- }
- }
- }
- return Status.OK_STATUS;
- }
- /**
- * @param javaWSDLParam The javaWSDLParam to set.
- */
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
- this.javaWSDLParam = javaWSDLParam;
- }
-
- /**
- * @param wsdlServiceURL The wsdlServiceURL to set.
- */
- public void setWsdlServiceURL(String wsdlServiceURL) {
- this.wsdlServiceURL = wsdlServiceURL;
- }
-
- /**
- * @return Returns the javaWSDLParam.
- */
- public JavaWSDLParameter getJavaWSDLParam() {
- return javaWSDLParam;
- }
-
- /**
- * @return Returns the webServicesParser.
- */
- public WebServicesParser getWebServicesParser() {
- return webServicesParser;
- }
-
- /**
- * @param webServicesParser The webServicesParser to set.
- */
- public void setWebServicesParser(WebServicesParser webServicesParser) {
- this.webServicesParser = webServicesParser;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/RefreshProjectCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/RefreshProjectCommand.java
deleted file mode 100644
index 650b520..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/RefreshProjectCommand.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.task;
-
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-
-public class RefreshProjectCommand extends AbstractDataModelOperation
-{
- private IProject project;
-
- public RefreshProjectCommand()
- {
- }
-
- /**
- * Execute RefreshProjectTask
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
- try
- {
- if (project!=null)
- project.refreshLocal(IProject.DEPTH_INFINITE, new NullProgressMonitor());
- }
- catch (CoreException e)
- {
- IStatus status = StatusUtils.errorStatus( AxisConsumptionUIMessages.MSG_ERROR_REFRESH_PROJECT, e);
- env.getStatusHandler().reportError(status);
- return status;
- }
- return Status.OK_STATUS;
- }
-
- public IProject getProject() {
- return project;
- }
-
- public void setProject(IProject project) {
- this.project = project;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanCommand.java
deleted file mode 100644
index b94021c..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanCommand.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060216 115144 pmoogk@ca.ibm.com - Peter Moogk
- * 20060503 126819 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060515 118315 mahutch@ca.ibm.com - Mark Hutchinson
- * 20060728 145426 kathy@ca.ibm.com - Kathy Chan
- * 20080613 236523 makandre@ca.ibm.com - Andrew Mak, Overwrite setting on Web service wizard is coupled with preference
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.consumption.ui.task;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Operation;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.xml.namespace.QName;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.NameMappingUtils;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-public class Stub2BeanCommand extends AbstractDataModelOperation
-{
- private WebServicesParser webServicesParser;
- private JavaWSDLParameter javaWSDLParam_;
- private String discoveredWsdlPortElementName;
- private Vector portTypes_;
- private String proxyBean_;
- private String outputFolder_;
- private String proxyEndpoint_;
-
- private IProject clientProject_;
-
- public Stub2BeanCommand(){
- super();
- portTypes_ = new Vector();
- }
-
- /**
- * Execute
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
- String inputWsdlLocation = javaWSDLParam_.getInputWsdlLocation();
- Definition def = webServicesParser.getWSDLDefinition(inputWsdlLocation);
- /*
- * Hack: Axis is not using a proper java.net.URL as its inputWsdlLocation.
- * We need to convert it to a proper file URL.
- */
- if (def == null)
- {
- File file = new File(inputWsdlLocation);
- if (file.exists())
- {
- try
- {
- def = webServicesParser.getWSDLDefinition(file.toURL().toString());
- }
- catch (MalformedURLException murle)
- {
- }
- }
- }
-
- //Ensure the client project is either a flexible project or a Java project
- ModuleCoreNature mn = ModuleCoreNature.getModuleCoreNature(clientProject_);
- if (mn==null)
- {
- // Check if it's a plain old Java project
- if (!ResourceUtils.isJavaProject(clientProject_))
- {
- IStatus status = StatusUtils.errorStatus( AxisConsumptionUIMessages.MSG_WARN_NO_JAVA_NATURE);
- environment.getStatusHandler().reportError(status);
- return status;
- }
- }
-
- Map pkg2nsMapping = javaWSDLParam_.getMappings();
- Map services = def.getServices();
- for (Iterator it = services.values().iterator(); it.hasNext();)
- {
- Service service = (Service)it.next();
- String servicePkgName = NameMappingUtils.getPackageName(service.getQName().getNamespaceURI(), pkg2nsMapping);
- String serviceClassName = computeClassName(service.getQName().getLocalPart());
- String jndiName = serviceClassName;
- Map ports = service.getPorts();
- for (Iterator it2 = ports.values().iterator(); it2.hasNext();)
- {
- if (serviceClassName.equals(computeClassName(((Port)it2.next()).getBinding().getPortType().getQName().getLocalPart())))
- {
- serviceClassName = serviceClassName + "_Service";
- break;
- }
- }
- for (Iterator it2 = ports.values().iterator(); it2.hasNext();)
- {
- Port port = (Port)it2.next();
- if (discoveredWsdlPortElementName != null && !discoveredWsdlPortElementName.equals(port.getName()))
- continue;
- SOAPAddress soapAddress = null;
- List extensibilityElements = port.getExtensibilityElements();
- if (extensibilityElements != null)
- {
- for (Iterator it3 = extensibilityElements.iterator(); it3.hasNext();)
- {
- Object object = it3.next();
- if (object instanceof SOAPAddress)
- {
- soapAddress = (SOAPAddress)object;
- break;
- }
- }
- }
- if (soapAddress != null)
- {
- proxyEndpoint_ = soapAddress.getLocationURI();
- PortType portType = port.getBinding().getPortType();
- QName portTypeQName = portType.getQName();
- StringBuffer portTypeID = new StringBuffer();
- portTypeID.append(portTypeQName.getNamespaceURI());
- portTypeID.append("#");
- portTypeID.append(portTypeQName.getLocalPart());
- if (!portTypes_.contains(portTypeID.toString()))
- {
- portTypes_.add(portTypeID.toString());
- Stub2BeanInfo stub2BeanInfo = new Stub2BeanInfo();
- stub2BeanInfo.setClientProject(clientProject_);
- stub2BeanInfo.setOutputFolder( outputFolder_ );
- String portTypePkgName = NameMappingUtils.getPackageName(portType.getQName().getNamespaceURI(), pkg2nsMapping);
-
- /*
- * If the package name and method name are the same the Axis
- * wsdl2Java Emitter adds a "_pkg" suffix to the package name
- * of generated code.
- *
- * We need to make sure the proxy get's put in this same package
- * if an operation name is the same as the package name.
- * (Mark Hutchinson - Bug 118315)
- */
- List operations = portType.getOperations();
- Iterator operIter = operations.iterator();
- boolean addSuffix = false;
- while (operIter.hasNext())
- {
- Operation operation = (Operation)operIter.next();
- if (operation.getName().equals(portTypePkgName))
- {
- addSuffix = true;
- }
- }
- if (addSuffix) {
- portTypePkgName = portTypePkgName + "_pkg";
- servicePkgName = servicePkgName + "_pkg";
- }
-
- String portTypeClassName = computeClassName(portTypeQName.getLocalPart());
- stub2BeanInfo.setPackage(portTypePkgName);
- stub2BeanInfo.setClass(portTypeClassName + "Proxy");
- proxyBean_ = portTypePkgName+"."+portTypeClassName+"Proxy";
- if (jndiName.equals(portTypeClassName))
- portTypeClassName = portTypeClassName + "_PortType";
- stub2BeanInfo.addSEI(portTypePkgName, portTypeClassName, servicePkgName, serviceClassName, jndiName, NameMappingUtils.getPortName(port.getName()));
- try
- {
- stub2BeanInfo.write(environment, monitor);
- if (discoveredWsdlPortElementName != null)
- {
- // The discovered port was processed. Ignore all other ports and services.
- return Status.OK_STATUS;
- }
- }
- catch (CoreException ce)
- {
- }
- catch (IOException ioe)
- {
- }
- }
- }
- }
- }
- return Status.OK_STATUS;
- }
-
- private String computeClassName(String className)
- {
- return NameMappingUtils.xmlNameToJavaClass(className);
- }
-
- /**
- * Returns the javaWSDLParam.
- * @return JavaWSDLParameter
- */
- public JavaWSDLParameter getJavaWSDLParam()
- {
- return javaWSDLParam_;
- }
-
- /**
- * Sets the javaWSDLParam.
- * @param javaWSDLParam The javaWSDLParam to set
- */
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
- {
- javaWSDLParam_ = javaWSDLParam;
- }
- /**
- * @return Returns the webServicesParser.
- */
- public WebServicesParser getWebServicesParser() {
- return webServicesParser;
- }
-
- /**
- * @param webServicesParser The webServicesParser to set.
- */
- public void setWebServicesParser(WebServicesParser webServicesParser) {
- this.webServicesParser = webServicesParser;
- }
-
-
- /**
- * @param discoveredWsdlPortElementName The discoveredWsdlPortElementName to set.
- */
- public void setDiscoveredWsdlPortElementName(String discoveredWsdlPortElementName) {
- this.discoveredWsdlPortElementName = discoveredWsdlPortElementName;
- }
-
- /**
- * @param clientProject The clientProject to set.
- */
- public void setClientProject(IProject clientProject) {
- this.clientProject_ = clientProject;
- }
-
- /**
- * @return Returns the proxyBean.
- */
- public String getProxyBean() {
- return proxyBean_;
- }
-
- public void setOutputFolder( String outputFolder )
- {
- outputFolder_ = outputFolder;
- }
-
- public String getProxyEndpoint() {
- return proxyEndpoint_;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanInfo.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanInfo.java
deleted file mode 100644
index c204eac..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanInfo.java
+++ /dev/null
@@ -1,646 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060216 115144 pmoogk@ca.ibm.com - Peter Moogk
- * 20060216 127138 pmoogk@ca.ibm.com - Peter Moogk
- * 20060517 141481 pmoogk@ca.ibm.com - Peter Moogk
- * 20070313 176580 makandre@ca.ibm.com - Andrew Mak, Generate a Client WS Proxy accepting URL
- * 20080613 236523 makandre@ca.ibm.com - Andrew Mak, Overwrite setting on Web service wizard is coupled with preference
- * 20080709 240225 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.consumption.ui.task;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.JavaVisibilityKind;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.common.JavaMOFUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.env.eclipse.BaseEclipseEnvironment;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.IStatusHandler;
-import com.ibm.icu.util.StringTokenizer;
-
-public class Stub2BeanInfo
-{
- private final String NEW_LINE = System.getProperty("line.separator");
-
- private int indentCount;
-
- private String package_;
- private StringBuffer imports_;
- private StringBuffer seis_;
- private StringBuffer services_;
- private StringBuffer jndiNames_;
- private StringBuffer ports_;
- private String class_;
- private Vector usedNames;
-
- private IProject clientProject_;
- private String outputFolder_;
-
- public Stub2BeanInfo()
- {
- indentCount = 0;
- package_ = null;
- imports_ = new StringBuffer();
- seis_ = new StringBuffer();
- services_ = new StringBuffer();
- jndiNames_ = new StringBuffer();
- ports_ = new StringBuffer();
- class_ = "SEIBean";
- usedNames = new Vector();
- }
-
- public void setClientProject(IProject clientProject) {
- this.clientProject_ = clientProject;
- }
-
- public void setOutputFolder( String outputFolder )
- {
- outputFolder_ = outputFolder;
- }
-
- public void setPackage(String pkgName)
- {
- package_ = pkgName;
- }
-
- public void addImports(String pkgName, String className)
- {
- imports_.append(toFullyQualifiedClassName(pkgName, className));
- imports_.append(";");
- }
-
- public void addSEI(String seiPkgName, String seiClassName, String servicePkgName, String serviceClassName, String portName)
- {
- addSEI(seiPkgName, seiClassName, servicePkgName, serviceClassName, serviceClassName, portName);
- }
-
- public void addSEI(String seiPkgName, String seiClassName, String servicePkgName, String serviceClassName, String jndiName, String portName)
- {
- seis_.append(toFullyQualifiedClassName(seiPkgName, seiClassName));
- seis_.append(";");
- services_.append(toFullyQualifiedClassName(servicePkgName, serviceClassName));
- services_.append(";");
- jndiNames_.append(jndiName);
- jndiNames_.append(";");
- ports_.append(portName);
- ports_.append(";");
- }
-
- public void setClass(String className)
- {
- class_ = className;
- }
-
- private String toFullyQualifiedClassName(String pkgName, String className)
- {
- StringBuffer sb = new StringBuffer();
- sb.append(pkgName);
- sb.append(".");
- sb.append(className);
- return sb.toString();
- }
-
- private String getPackageName(String qname)
- {
- int index = qname.lastIndexOf(".");
- if (index != -1)
- return qname.substring(0, index);
- else
- return qname;
- }
-
- private String getClassName(String qname)
- {
- int index = qname.lastIndexOf(".");
- if (index != -1)
- return qname.substring(index+1, qname.length());
- else
- return qname;
- }
-
- private String firstCharToLowerCase(String s)
- {
- StringBuffer sb = new StringBuffer();
- sb.append(s.substring(0, 1).toLowerCase());
- sb.append(s.substring(1, s.length()));
- return sb.toString();
- }
-
- private String getFullyQualifiedName(JavaHelpers javaHelpers)
- {
- if (javaHelpers.isPrimitive())
- return javaHelpers.getJavaName();
- else
- return javaHelpers.getQualifiedName();
- }
-
- public void write(IEnvironment env, IProgressMonitor progressMonitor) throws CoreException, IOException
- {
- IStatusHandler statusMonitor = env.getStatusHandler();
-
- IPath outputPath = new Path( outputFolder_ );
- IProject project = ResourceUtils.getProjectOf( outputPath );
- StringWriter sw = new StringWriter(2048);
-
- writePackage(sw);
- writeImports(sw);
- writeClass(sw);
- sw.close();
- byte[] bytes = sw.getBuffer().toString().getBytes( project.getDefaultCharset() );
- StringBuffer sb = new StringBuffer();
- if (package_ != null && package_.length() > 0)
- {
- sb.append(package_);
- sb.append(".");
- }
- sb.append(class_);
- sb = new StringBuffer(sb.toString().replace('.', '/'));
- sb.append(".java");
-
- ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
-
- IPath newFilePath = new Path(outputFolder_).append( sb.toString() );
-
- FileResourceUtils.createFile(((BaseEclipseEnvironment) env).getResourceContext(), newFilePath, bais, progressMonitor, statusMonitor);
- }
-
- private void writePackage(Writer w) throws IOException
- {
- if (package_ != null && package_.length() > 0)
- {
- w.write("package ");
- w.write(package_);
- w.write(";");
- newLine(w);
- }
- }
-
- private void writeImports(Writer w) throws IOException
- {
- StringTokenizer st = new StringTokenizer(imports_.toString(), ";");
- while (st.hasMoreTokens())
- {
- w.write("import ");
- w.write(st.nextToken());
- w.write(";");
- newLine(w);
- }
- }
-
- private void writeClass(Writer w) throws IOException, CoreException
- {
- newLine(w);
- w.write("public class ");
- w.write(class_);
- w.write(" ");
- StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
- if (st.hasMoreTokens())
- w.write("implements ");
- while (st.hasMoreTokens())
- {
- w.write(st.nextToken());
- if (st.hasMoreTokens())
- w.write(", ");
- }
- w.write(" {");
- incrementIndent();
- newLine(w);
- writeFieldsDeclarations(w);
- writeConstructor(w);
- writeInit(w);
- /*
- * Cannot use JNDI lookup for AXIS
- *
- writeUseJNDI(w);
- */
- writeGetSetEndpoint(w);
- writeSEIGetters(w);
- writeSEIMethods(w);
- decrementIndent();
- newLine(w);
- w.write("}");
- }
-
- private void writeFieldsDeclarations(Writer w) throws IOException
- {
- /*
- * Cannot use JNDI lookup for AXIS
- *
- w.write("private boolean _useJNDI = true;");
- newLine(w);
- */
- w.write("private String _endpoint = null;");
- usedNames.add("_endpoint");
- newLine(w);
- StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
- while (st.hasMoreTokens())
- {
- w.write("private ");
- String sei = st.nextToken();
- w.write(sei);
- w.write(" ");
- String stubName = firstCharToLowerCase(getClassName(sei));
- w.write(stubName);
- usedNames.add(stubName);
- w.write(" = null;");
- newLine(w);
- }
- }
-
- private void writeConstructor(Writer w) throws IOException
- {
- newLine(w);
- w.write("public ");
- w.write(class_);
- w.write("() {");
- incrementIndent();
- newLine(w);
- w.write("_init");
- w.write(class_);
- w.write("();");
- decrementIndent();
- newLine(w);
- w.write("}");
- newLine(w);
-
- newLine(w);
- w.write("public ");
- w.write(class_);
- w.write("(String endpoint) {");
- incrementIndent();
- newLine(w);
- w.write("_endpoint = endpoint;");
- newLine(w);
- w.write("_init");
- w.write(class_);
- w.write("();");
- decrementIndent();
- newLine(w);
- w.write("}");
- newLine(w);
- }
-
- private void writeInit(Writer w) throws IOException
- {
- newLine(w);
- w.write("private void _init");
- w.write(class_);
- w.write("() {");
- incrementIndent();
- newLine(w);
- w.write("try {");
- incrementIndent();
- newLine(w);
- /*
- * Cannot use JNDI lookup for AXIS
- *
- w.write("if (_useJNDI) {");
- incrementIndent();
- newLine(w);
- */
- StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
- StringTokenizer serviceTokens = new StringTokenizer(services_.toString(), ";");
- //StringTokenizer jndiNameTokens = new StringTokenizer(jndiNames_.toString(), ";");
- StringTokenizer portTokens = new StringTokenizer(ports_.toString(), ";");
- /*
- if (st.hasMoreTokens())
- {
- w.write("javax.naming.InitialContext ctx = new javax.naming.InitialContext();");
- newLine(w);
- }
- while (st.hasMoreTokens())
- {
- w.write(firstCharToLowerCase(getClassName(st.nextToken())));
- w.write(" = ((");
- w.write(serviceTokens.nextToken());
- w.write(")ctx.lookup(\"java:comp/env/service/");
- w.write(jndiNameTokens.nextToken());
- w.write("\")).get");
- w.write(mangleClassName(portTokens.nextToken()));
- w.write("();");
- newLine(w);
- }
- decrementIndent();
- newLine(w);
- w.write("}");
- newLine(w);
- w.write("else {");
- incrementIndent();
- newLine(w);
- st = new StringTokenizer(seis_.toString(), ";");
- serviceTokens = new StringTokenizer(services_.toString(), ";");
- portTokens = new StringTokenizer(ports_.toString(), ";");
- */
- while (st.hasMoreTokens())
- {
- String seiName = firstCharToLowerCase(getClassName(st.nextToken()));
- w.write(seiName);
- w.write(" = (new ");
- w.write(serviceTokens.nextToken());
- w.write("Locator()).get");
- w.write(portTokens.nextToken());
- w.write("();");
- newLine(w);
- w.write("if (");
- w.write(seiName);
- w.write(" != null) {");
- incrementIndent();
- newLine(w);
- w.write("if (_endpoint != null)");
- incrementIndent();
- newLine(w);
- w.write("((javax.xml.rpc.Stub)");
- w.write(seiName);
- w.write(")._setProperty(\"javax.xml.rpc.service.endpoint.address\", _endpoint);");
- decrementIndent();
- newLine(w);
- w.write("else");
- incrementIndent();
- newLine(w);
- w.write("_endpoint = (String)((javax.xml.rpc.Stub)");
- w.write(seiName);
- w.write(")._getProperty(\"javax.xml.rpc.service.endpoint.address\");");
- decrementIndent();
- decrementIndent();
- newLine(w);
- w.write("}");
- newLine(w);
- }
- /*
- decrementIndent();
- newLine(w);
- w.write("}");
- */
- decrementIndent();
- newLine(w);
- w.write("}");
- newLine(w);
- /*
- w.write("catch (javax.naming.NamingException namingException) {}");
- newLine(w);
- */
- w.write("catch (javax.xml.rpc.ServiceException serviceException) {}");
- decrementIndent();
- newLine(w);
- w.write("}");
- newLine(w);
- }
-
- private void writeSetPropertyEndpoint(Writer w) throws IOException
- {
- StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
- while (st.hasMoreTokens())
- {
- String seiName = firstCharToLowerCase(getClassName(st.nextToken()));
- w.write("if (");
- w.write(seiName);
- w.write(" != null)");
- incrementIndent();
- newLine(w);
- w.write("((javax.xml.rpc.Stub)");
- w.write(seiName);
- w.write(")._setProperty(\"javax.xml.rpc.service.endpoint.address\", _endpoint);");
- decrementIndent();
- newLine(w);
- }
- }
-
-
- private void writeSEIGetters(Writer w) throws IOException
- {
- StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
- while (st.hasMoreTokens())
- {
- String sei = st.nextToken();
- String seiClassName = getClassName(sei);
- String seiFieldName = firstCharToLowerCase(seiClassName);
- newLine(w);
- w.write("public ");
- w.write(sei);
- w.write(" get");
- w.write(seiClassName);
- w.write("() {");
- incrementIndent();
- newLine(w);
- w.write("if (");
- w.write(seiFieldName);
- w.write(" == null)");
- incrementIndent();
- newLine(w);
- w.write("_init");
- w.write(class_);
- w.write("();");
- decrementIndent();
- newLine(w);
- w.write("return ");
- w.write(seiFieldName);
- w.write(";");
- decrementIndent();
- newLine(w);
- w.write("}");
- newLine(w);
- }
- }
-
- private void writeSEIMethods(Writer w) throws IOException, CoreException
- {
- newLine(w);
- //WebServiceElement wse = WebServiceElement.getWebServiceElement(model_);
- if (clientProject_ == null) return;//wse.getProxyProject();
- boolean buildProjectCalled = false;
- StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
- while (st.hasMoreTokens())
- {
- String sei = st.nextToken();
- JavaClass javaClass = JavaMOFUtils.getJavaClass(getPackageName(sei), getClassName(sei), clientProject_);
- if (javaClass == null) { // build the project if build project has not been called yet and try again
- if (!buildProjectCalled) {
- clientProject_.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
- buildProjectCalled = true;
- javaClass = JavaMOFUtils.getJavaClass(getPackageName(sei), getClassName(sei), clientProject_);
- }
- }
- if (javaClass != null)
- {
- List methods = javaClass.getMethods();
- if (methods.isEmpty()) {
- if (!buildProjectCalled) { // build the project if build project has not been called yet and try again
- clientProject_.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
- buildProjectCalled = true;
- javaClass = JavaMOFUtils.getJavaClass(getPackageName(sei), getClassName(sei), clientProject_);
- if (javaClass != null)
- methods = javaClass.getMethods();
- }
- }
- for (Iterator it = methods.iterator(); it.hasNext();)
- {
- Method method = (Method)it.next();
- if (!method.isConstructor() && !method.isNative() && method.getJavaVisibility().getValue() == JavaVisibilityKind.PUBLIC)
- writeSEIMethods(w, javaClass, method);
- }
- }
- }
- }
-
- private void writeSEIMethods(Writer w, JavaClass javaClass, Method method) throws IOException
- {
- w.write("public ");
- // isVoid
- if (method.isVoid())
- w.write("void ");
- else
- {
- w.write(getFullyQualifiedName(method.getReturnType()));
- w.write(" ");
- }
- // method name
- w.write(method.getName());
- w.write("(");
- // input parameters
- JavaParameter[] inputParams = method.listParametersWithoutReturn();
- for (int i = 0; i < inputParams.length; i++)
- {
- if (i > 0)
- w.write(", ");
- JavaHelpers javaHelpers = inputParams[i].getJavaType();
- w.write(getFullyQualifiedName(javaHelpers));
- w.write(" ");
- String paramName = getClassName(inputParams[i].getQualifiedName());
- w.write(getUnusedName(paramName));
- }
- w.write(")");
- // exceptions
- List exceptions = method.getJavaExceptions();
- if (!exceptions.isEmpty())
- w.write(" throws ");
- for (Iterator it = exceptions.iterator(); it.hasNext();)
- {
- JavaClass exception = (JavaClass)it.next();
- w.write(exception.getQualifiedNameForReflection());
- if (it.hasNext())
- w.write(", ");
- }
- // method body
- w.write("{");
- incrementIndent();
- newLine(w);
- String stubName = firstCharToLowerCase(javaClass.getName());
- w.write("if (");
- w.write(stubName);
- w.write(" == null)");
- incrementIndent();
- newLine(w);
- w.write("_init");
- w.write(class_);
- w.write("();");
- decrementIndent();
- newLine(w);
- if (!method.isVoid())
- w.write("return ");
- w.write(stubName);
- w.write(".");
- w.write(method.getName());
- w.write("(");
- for (int i = 0; i < inputParams.length; i++)
- {
- if (i > 0)
- w.write(", ");
- String paramName = getClassName(inputParams[i].getQualifiedName());
- w.write(getUnusedName(paramName));
- }
- w.write(");");
- decrementIndent();
- newLine(w);
- w.write("}");
- newLine(w);
- newLine(w);
- }
-
- private void writeGetSetEndpoint(Writer w) throws IOException
- {
- newLine(w);
- w.write("public String getEndpoint() {");
- incrementIndent();
- newLine(w);
- w.write("return _endpoint;");
- decrementIndent();
- newLine(w);
- w.write("}");
- newLine(w);
- newLine(w);
- w.write("public void setEndpoint(String endpoint) {");
- incrementIndent();
- newLine(w);
- w.write("_endpoint = endpoint;");
- newLine(w);
- writeSetPropertyEndpoint(w);
- decrementIndent();
- newLine(w);
- w.write("}");
- newLine(w);
- }
-
- private void incrementIndent()
- {
- indentCount++;
- }
-
- private void decrementIndent()
- {
- indentCount--;
- }
-
- private void indent(Writer w) throws IOException
- {
- for (int i = 0; i < indentCount; i++)
- w.write(" ");
- }
-
- private void newLine(Writer w) throws IOException
- {
- w.write(NEW_LINE);
- indent(w);
- }
-
- private String getUnusedName(String name)
- {
- if (usedNames.contains(name))
- {
- for (int i = 0; i < 100; i++)
- {
- String newName = (new StringBuffer(name)).append(String.valueOf(i)).toString();
- if (!usedNames.contains(newName))
- return newName;
- }
- }
- return name;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ValidateWSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ValidateWSDLCommand.java
deleted file mode 100644
index 01cb999..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ValidateWSDLCommand.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.consumption.ui.task;
-
-import javax.wsdl.Definition;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-
-public class ValidateWSDLCommand extends AbstractDataModelOperation
-{
- private WebServicesParser webServicesParser;
- private String wsdlURI;
-
- public ValidateWSDLCommand()
- {
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
- if (wsdlURI != null && wsdlURI.length() > 0)
- {
- Definition definition = webServicesParser.getWSDLDefinition(wsdlURI);
- if (definition != null)
- {
- int numServices = definition.getServices().size();
- if (numServices < 1)
- {
- IStatus status = StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_ERROR_WSDL_HAS_NO_SERVICE_ELEMENT, new Object[] {wsdlURI}), null);
- environment.getStatusHandler().reportError(status);
- return status;
- }
- }
- }
- return Status.OK_STATUS;
- }
-
- /**
- * @param wsdlURI The wsdlURI to set.
- */
- public void setWsdlURI(String wsdlURI)
- {
- this.wsdlURI = wsdlURI;
- }
-
- /**
- * @param webServicesParser The webServicesParser to set.
- */
- public void setWebServicesParser(WebServicesParser webServicesParser)
- {
- this.webServicesParser = webServicesParser;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/ClasspathUtils.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/ClasspathUtils.java
deleted file mode 100644
index f794c78..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/ClasspathUtils.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060203 126418 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.util;
-
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-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.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-
-public class ClasspathUtils {
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2003."; //$NON-NLS-1$
-
- private static ClasspathUtils instance_; //$NON-NLS-1$
- private static String DOT_JAR = ".jar"; //$NON-NLS-1$
- private static String JAR = "jar"; //$NON-NLS-1$
- private static String WEBINF_LIB = "/WEB-INF/lib"; //$NON-NLS-1$
-
- private ClasspathUtils() {
- }
-
- public static ClasspathUtils getInstance() {
- if (instance_ == null)
- instance_ = new ClasspathUtils();
- return instance_;
- }
-
- public String getClasspathString(IProject project) {
- StringBuffer classpath = new StringBuffer();
- String[] classpathEntries = getClasspath(project, false);
-
- Vector classpathVector = new Vector();
- for (int i = 0; i < classpathEntries.length; i++) {
- if (!classpathVector.contains(classpathEntries[i])) {
- classpathVector.add(classpathEntries[i]);
- classpath.append(classpathEntries[i]);
- classpath.append(";"); //$NON-NLS-1$
- }
- }
- return classpath.toString();
- }
-
-
- private String[] getClasspath(IProject project, boolean isDependent) {
- String[] moduleClasspath = new String[0];
- ArrayList projectClasspath = new ArrayList();
- boolean needJavaClasspath = false;
-
- IVirtualComponent comp = ComponentCore.createComponent(project);
- if (comp != null) {
- // get the module's classpath
-
- if (J2EEUtils.isEARComponent(comp)) {
- moduleClasspath = getClasspathForEARProject(project, comp.getName());
-// add module classpath to project classpath
- for (int j = 0; j < moduleClasspath.length; j++) {
- projectClasspath.add(moduleClasspath[j]);
- }
- } else if (J2EEUtils.isWebComponent(comp) || J2EEUtils.isJavaComponent(comp)) {
- needJavaClasspath = true;
-
- IContainer outputContainer = null;
- IResource fragmentRoot = null;
- IPackageFragmentRoot[] pkgFragmentRoot = ResourceUtils.getJavaPackageFragmentRoots(project);
- ArrayList webModuleClasspath = new ArrayList();
- try {
- for (int i = 0; i < pkgFragmentRoot.length; i++) {
- fragmentRoot = pkgFragmentRoot[i].getCorrespondingResource();
- if (fragmentRoot != null
- && (fragmentRoot.getProject().equals(project))
- && (fragmentRoot.getType() != IResource.FILE)) {
- outputContainer = J2EEProjectUtilities.getOutputContainer(project, pkgFragmentRoot[i]);
- if (outputContainer != null) {
- webModuleClasspath.add(outputContainer.getLocation().toOSString());
- }
- }
- }
- } catch (JavaModelException e) {
- }
-
- // add Web module classpath to project classpath
- Iterator iter = webModuleClasspath.iterator();
- while (iter.hasNext()) {
- projectClasspath.add((String) iter.next());
- }
- }
-
- if (!isDependent) {
- if (J2EEUtils.isWebComponent(comp)) {
- needJavaClasspath = true;
- moduleClasspath = getWEBINFLib(project);
- for (int j = 0; j < moduleClasspath.length; j++) {
- projectClasspath.add(moduleClasspath[j]);
- }
- }
- }
-
- } else {
- needJavaClasspath = true;
- }
-
- // If there are Web or Java module in the project, get the project's Java classpath
- if (needJavaClasspath) {
- String[] javaClasspath;
- try {
- IJavaProject javaProj = (IJavaProject) project.getNature(JavaCore.NATURE_ID);
- if (javaProj != null) {
- javaClasspath = getClasspathForJavaProject(javaProj);
- for (int j = 0; j < javaClasspath.length; j++) {
- projectClasspath.add(javaClasspath[j]);
- }
- }
- } catch (CoreException e) {
- // not able to get Java classpath, just ignore
- }
- }
-
- return (String[]) projectClasspath.toArray(new String[projectClasspath.size()]);
- }
-
- // Need to get all modules in the project. If there's a EAR module, get the utility JARs
- private String[] getUtilityJarClasspath(IProject project) {
- String[] utilityJarString = new String[0];
- String[] moduleClasspath = new String[0];
- ArrayList utilityJarsClasspath = new ArrayList();
-
- String module;
- IVirtualComponent comp = ComponentCore.createComponent(project);
- if (comp != null) {
- module = comp.getName();
- if (J2EEUtils.isEARComponent(comp)) {
- moduleClasspath = getClasspathForEARProject(project, module);
- for (int j = 0; j < moduleClasspath.length; j++) {
- utilityJarsClasspath.add(moduleClasspath[j]);
- }
- utilityJarString = (String[]) utilityJarsClasspath.toArray(new String[utilityJarsClasspath.size()]);
- }
- }
-
- return utilityJarString;
- }
-
- private String[] getClasspathForEARProject(IProject project, String module) {
- IPath projectPath =
- project.getProject().getLocation().addTrailingSeparator().append(module).addTrailingSeparator();
- return getDirectoryJarFiles(projectPath);
- }
-
- private String[] getDirectoryJarFiles(IPath iPath) {
- File dir = iPath.toFile();
- Vector jarsVector = new Vector();
- if (dir.exists() && dir.isDirectory()) {
- String[] filenames = dir.list();
- for (int i = 0; i < filenames.length; i++) {
- if (filenames[i].endsWith(DOT_JAR))
- jarsVector.add(path2String(iPath) + filenames[i]);
- }
- }
- String[] jars = new String[jarsVector.size()];
- jarsVector.copyInto(jars);
- return jars;
- }
-
- private String[] getWEBINFLib(IProject project) {
- String[] webinfLibJars = new String[0];
- ArrayList anArrayList = new ArrayList();
- try {
- IVirtualComponent component = ComponentCore.createComponent(project);
- if (component != null) {
-
- IVirtualFolder webInfLib = component.getRootFolder().getFolder(new Path(
- WEBINF_LIB));
- if (webInfLib != null) {
- IVirtualResource[] resources = webInfLib.members();
- IResource aResource = null;
- for (int i = 0; i < resources.length; i++) {
- aResource = resources[i].getUnderlyingResource();
- if (JAR.equalsIgnoreCase(aResource.getFileExtension()))
- anArrayList.add( aResource.getLocation().toOSString());
- }
- if (anArrayList.size() != 0)
- webinfLibJars = (String[]) anArrayList.toArray(new String[anArrayList.size()]);
- }
- }
- } catch (CoreException e) {
- }
- return webinfLibJars;
- }
-
- private String[] getClasspathForJavaProject(IJavaProject javaProject) {
- ArrayList projectClasspath = new ArrayList();
- try {
- IClasspathEntry[] buildPath =
- javaProject.getResolvedClasspath(true);
- for (int i = 0; i < buildPath.length; i++) {
- String[] buildPathString =
- classpathEntry2String(
- buildPath[i],
- javaProject.getProject());
- for (int j = 0; j < buildPathString.length; j++) {
- projectClasspath.add(buildPathString[j]);
- }
- }
- } catch (JavaModelException jme) {
- }
-
- String[] utilityJarsClasspath;
- IProject project = javaProject.getProject();
- IProject[] referencingProjects = project.getReferencingProjects();
- for (int i = 0; i < referencingProjects.length; i++) {
- utilityJarsClasspath = getUtilityJarClasspath(referencingProjects[i]);
- for (int j = 0; j < utilityJarsClasspath.length; j++) {
- projectClasspath.add(utilityJarsClasspath[j]);
- }
- }
-
- return (String[]) projectClasspath.toArray(new String[projectClasspath.size()]);
- }
-
- private String[] classpathEntry2String(
- IClasspathEntry entry,
- IProject project)
- {
- switch (entry.getEntryKind()) {
- case IClasspathEntry.CPE_LIBRARY :
- {
- return new String[] { path2String(entry.getPath())};
- }
- case IClasspathEntry.CPE_PROJECT :
- {
- return getClasspath(
- ResourcesPlugin.getWorkspace().getRoot().getProject(
- entry.getPath().lastSegment()), true);
- }
- case IClasspathEntry.CPE_SOURCE :
- {
- IPath path = entry.getPath();
- if (path.segment(0).equals(project.getName()))
- path = path.removeFirstSegments(1);
- return new String[] {
- path2String(
- project
- .getLocation()
- .addTrailingSeparator()
- .append(
- path))};
- }
- case IClasspathEntry.CPE_VARIABLE :
- {
- return classpathEntry2String(
- JavaCore.getResolvedClasspathEntry(entry),
- project);
- }
- default :
- {
- return new String[] { path2String(entry.getPath())};
- }
- }
- }
-
- private String path2String(IPath path) {
- return path.toOSString();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/FileUtil.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/FileUtil.java
deleted file mode 100644
index 16dbb8a..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/FileUtil.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.util;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-public class FileUtil
-{
- public FileUtil()
- {
- super();
- }
-
- public static void copyFile(String src, String dest)
- {
- InputStream is = null;
- FileOutputStream fos = null;
-
- try
- {
- is = new FileInputStream(src);
- fos = new FileOutputStream(dest);
- int c = 0;
- byte[] array = new byte[1024];
- while ((c = is.read(array)) >= 0)
- {
- fos.write(array, 0, c);
- }
- }
- catch (Exception e)
- {
- }
- finally
- {
- try
- {
- fos.close();
- is.close();
- }
- catch (Exception e)
- {
- }
- }
- }
-
- public static File createFileAndParentDirectories(String fileName) throws Exception
- {
- File file = new File(fileName);
- File parent = file.getParentFile();
- if (!parent.exists())
- {
- parent.mkdirs();
- }
- file.createNewFile();
- return file;
- }
-
- public static void deleteDirectories(File dir) throws Exception
- {
- File[] children = dir.listFiles();
- for (int i = 0; i < children.length; i++)
- {
- if (children[i].list() != null && children[i].list().length > 0)
- {
- deleteDirectories(children[i]);
- }
- else
- {
- children[i].delete();
- }
- }
- dir.delete();
- }
-
- /**
- * Creates a folder and all parent folders if not existing Project must exist
- */
- public static void createFolder(IFolder folder, boolean force, boolean local) throws CoreException
- {
- if (!folder.exists())
- {
- IContainer parent = folder.getParent();
- if (parent instanceof IFolder)
- {
- createFolder((IFolder)parent, force, local);
- }
- folder.create(force, local, new NullProgressMonitor());
- }
- }
-
- public static void createTargetFile(String sourceFileName, String targetFileName) throws Exception
- {
- createTargetFile(sourceFileName, targetFileName, false);
- }
-
- public static void createTargetFile(String sourceFileName, String targetFileName, boolean overwrite) throws Exception
- {
- File idealResultFile = new File(targetFileName);
- if (overwrite || !idealResultFile.exists())
- {
- FileUtil.createFileAndParentDirectories(targetFileName);
- FileUtil.copyFile(sourceFileName, targetFileName);
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/PlatformUtils.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/PlatformUtils.java
deleted file mode 100644
index 2af0e3b..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/PlatformUtils.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.util;
-
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-
-public class PlatformUtils {
-
- public static final String PLATFORM_ROOT = "platform:/resource";
- public static final String WIN_FILE_PROTOCOL = "file:/";
- public static final String LNX_FILE_PROTOCOL = "file://";
- public static final String PLATFORM = "platform";
- public static final String RESOURCE = "/resource";
-
- private PlatformUtils() {
- }
-
- /**
- * Returns the string representation of platform URL given an IPath
- * @param IPath path
- * @return String platformURL
- */
- public static String getPlatformURL(IPath path) {
- String platformURL;
- platformURL = URI.createPlatformResourceURI(path.toString()).toString();
- // old method: file system representation
- // platformURL = ResourcesPlugin.getWorkspace().getRoot().getFile(path).getLocation().toString();
- return platformURL;
- }
-
- /**
- * Returns the URL representation of the Platform URL given an IPath
- * The PlatformResourceManager underdstands this format and therefore
- * this is suited for command URL's
- * @param IPath path
- * @return URL Platform URL
- */
- public static URL getCommandPlatformURL(IPath path) {
- URL url = null;
- try {
- url = new URL(PLATFORM, null, RESOURCE + path.toString());
- } catch (MalformedURLException e) {
- return url;
- }
- return url;
- }
-
- /**
- * Returns the string representation of path given platform URL string
- * @param String platform URL string
- * @return String path string
- */
- public static String getPathFromPlatform(String platformStr) {
- String pathStr = platformStr;
-
- String rootLocation;
- rootLocation = PLATFORM_ROOT;
- // old method: file system representation
- // rootLocation = ResourcesPlugin.getWorkspace().getRoot().getLocation().toString();
- if (platformStr.startsWith(rootLocation))
- pathStr = platformStr.substring(rootLocation.length());
- return pathStr;
- }
-
- /**
- * Returns the string representation of platform URL given the path string
- * @param String path string
- * @return String platform URL string
- */
- public static String getPlatformFromPath(String pathStr) {
- String platformStr = pathStr;
-
- String rootLocation;
- rootLocation = PLATFORM_ROOT;
- // old method: file system representation
- // rootLocation = ResourcesPlugin.getWorkspace().getRoot().getLocation().toString();
- platformStr = rootLocation + pathStr;
- return platformStr;
- }
-
- /**
- * Returns the string representation of the local file system file given platform URL string
- * @param String platform URL string
- * @return String file string
- */
- public static String getFileFromPlatform(String platformStr) {
- String fileStr = platformStr;
- String pathStr = getPathFromPlatform(platformStr);
-
- fileStr =
- ResourcesPlugin
- .getWorkspace()
- .getRoot()
- .getFile(new Path(pathStr))
- .getLocation()
- .toString();
-
- // old method: file system representation
- // Do nothing
-
- return fileStr;
- }
-
- /**
- * Returns the file protocol representation of the local file system file given platform URL string
- * @param String platform URL string
- * @return String the file protocol uri
- */
- public static String getFileURLFromPlatform(String platformStr) {
- String fileStr = platformStr;
- String pathStr = getPathFromPlatform(platformStr);
- try {
- fileStr =
- ResourcesPlugin
- .getWorkspace()
- .getRoot()
- .getFile(new Path(pathStr))
- .getLocation()
- .toFile()
- .toURL()
- .toString();
- } catch (MalformedURLException murle) {
- fileStr = getFileURLFromPath(new Path(pathStr));
- }
- return fileStr;
- }
-
- /**
- * Returns the file protocol representation of a local file
- * @param IPath the Path object representing the file
- * @return String the file protocol uri
- */
- public static String getFileURLFromPath(IPath path) {
-
- String file = null;
- if (path != null) {
- if (!path.isAbsolute()) {
- file =
- ResourcesPlugin
- .getWorkspace()
- .getRoot()
- .getFile(path)
- .getLocation()
- .toString();
- if (file.charAt(0) == IPath.SEPARATOR) {
- file = LNX_FILE_PROTOCOL + file;
- } else {
- file = WIN_FILE_PROTOCOL + file;
- }
- } else {
- file = path.toString();
- }
- if (file != null && file.charAt(0) == IPath.SEPARATOR) {
- file = LNX_FILE_PROTOCOL + file;
- } else {
- file = WIN_FILE_PROTOCOL + file;
- }
- }
- return file == null ? null : file;
-
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/WSDLUtils.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/WSDLUtils.java
deleted file mode 100644
index 3cb3670..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/WSDLUtils.java
+++ /dev/null
@@ -1,514 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060216 127138 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.consumption.ui.util;
-
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Map;
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-import javax.xml.namespace.QName;
-import org.apache.axis.wsdl.toJava.Utils;
-import org.eclipse.wst.wsdl.internal.impl.wsdl4j.WSDLFactoryImpl;
-import com.ibm.icu.text.Collator;
-import com.ibm.icu.util.StringTokenizer;
-
-public class WSDLUtils {
-
- private static final String DOT = ".";
-
- /**
- * These are java keywords as specified at the following URL (sorted alphabetically).
- * http://java.sun.com/docs/books/jls/second_edition/html/lexical.doc.html#229308
- * Note that false, true, and null are not strictly keywords; they are literal values,
- * but for the purposes of this array, they can be treated as literals.
- */
- static final String keywords[] =
- {
- "abstract", "boolean", "break", "byte", "case",
- "catch", "char", "class", "const", "continue",
- "default", "do", "double", "else", "extends",
- "false", "final", "finally", "float", "for",
- "goto", "if", "implements", "import", "instanceof",
- "int", "interface", "long", "native", "new",
- "null", "package", "private", "protected", "public",
- "return", "short", "static", "strictfp", "super",
- "switch", "synchronized", "this", "throw", "throws",
- "transient", "true", "try", "void", "volatile",
- "while"
- };
-
- /** Collator for comparing the strings */
- static final Collator englishCollator = Collator.getInstance(Locale.ENGLISH);
-
- /** Use this character as suffix */
- static final char keywordPrefix = '_';
-
- private WSDLUtils() {
- }
-
- /**
- * Returns the name of the first service element in the WSDL definition.
- * @return String service element name
- */
- public static String getServiceElementName(Definition definition) {
- Service service = (Service) definition.getServices().values().iterator().next();
- return service.getQName().getLocalPart();
- }
-
- /**
- * Returns the name of the port type element points to by the first service and port element in the WSDL definition.
- * @return String port type element name
- */
- public static String getPortTypeName(Definition definition) {
- Service service = (Service) definition.getServices().values().iterator().next();
- Iterator iterator = service.getPorts().values().iterator();
- while(iterator.hasNext()){
- Port port = (Port) iterator.next();
- for (int i=0; i<port.getExtensibilityElements().size();i++) {
- if (port.getExtensibilityElements().get(i) instanceof SOAPAddress) {
- Binding binding = port.getBinding();
- return binding.getPortType().getQName().getLocalPart();
- }
- }
- }
- return "";
-
- }
-
- /**
- * Returns the name of the port element in the WSDL definition.
- * @return String port name
- */
- public static String getPortName(Definition definition) {
- Service service = (Service) definition.getServices().values().iterator().next();
- Iterator iterator = service.getPorts().values().iterator();
- while(iterator.hasNext()){
- Port port = (Port) iterator.next();
- for (int i=0; i<port.getExtensibilityElements().size();i++) {
- if (port.getExtensibilityElements().get(i) instanceof SOAPAddress)
- return port.getName();
- }
- }
- return "";
- }
-
-
-
- public static String makeNamespace (String clsName) {
- return makeNamespace(clsName, "http");
- }
-
- /**
- * Make namespace from a fully qualified class name
- * and the given protocol
- *
- * @param clsName fully qualified class name
- * @param protocol protocol String
- * @return namespace namespace String
- */
- public static String makeNamespace (String clsName, String protocol) {
- if (clsName.lastIndexOf('.') == -1)
- return protocol + "://" + "DefaultNamespace";
- String packageName = clsName.substring(0, clsName.lastIndexOf('.'));
- return makeNamespaceFromPackageName(packageName, protocol);
- }
-
-
- private static String makeNamespaceFromPackageName(String packageName, String protocol) {
- if (packageName == null || packageName.equals(""))
- return protocol + "://" + "DefaultNamespace";
- StringTokenizer st = new StringTokenizer( packageName, "." );
- String[] words = new String[ st.countTokens() ];
- for(int i = 0; i < words.length; ++i)
- words[i] = st.nextToken();
-
- StringBuffer sb = new StringBuffer(80);
- for(int i = words.length-1; i >= 0; --i) {
- String word = words[i];
- // seperate with dot
- if( i != words.length-1 )
- sb.append('.');
- sb.append( word );
- }
- return protocol + "://" + sb.toString();
- }
-
- /**
- * Return a Definition for the wsdl url given
- *
- */
- public static Definition getWSDLDefinition(String wsdlURL)
- {
- if(wsdlURL == null) return null;
-
- WSDLFactory wsdlFactory;
- Definition definition = null;
- try {
- wsdlFactory = new WSDLFactoryImpl();
- WSDLReader wsdlReader = wsdlFactory.newWSDLReader();
- definition = wsdlReader.readWSDL(wsdlURL);
- }
- catch (Exception e) { // can be WSDLException or IOException
- return null;
- }
- return definition;
- }
-
- public static String getPackageName(Definition definition)
- {
- if (definition != null)
- {
- String namespace = definition.getTargetNamespace();
- return namespaceURI2PackageName(namespace);
- }
- return "";
- }
-
- public static String getPackageNameForBindingImpl(Port port, Map ns2pkgMap)
- {
- if (port != null && ns2pkgMap != null)
- {
- Binding binding = port.getBinding();
- QName bndQName = binding.getQName();
- String namespace = bndQName.getNamespaceURI();
- Object pkg = ns2pkgMap.get(namespace);
- if (pkg != null)
- return (String)pkg;
- }
- return getPackageNameForBindingImpl(port);
- }
-
- public static String getPackageNameForBindingImpl(Definition definition, Map ns2pkgMap)
- {
- if (definition != null && ns2pkgMap != null)
- {
- Service service = (Service) definition.getServices().values().iterator().next();
- Port port = (Port) service.getPorts().values().iterator().next();
- return getPackageNameForBindingImpl(port, ns2pkgMap);
- }
- return getPackageNameForBindingImpl(definition);
- }
-
- public static String getPackageNameForBindingImpl(Definition definition)
- {
- Port port = null;
- if (definition != null)
- {
- Service service = (Service)definition.getServices().values().iterator().next();
- port = (Port)service.getPorts().values().iterator().next();
- }
- return getPackageNameForBindingImpl(port);
- }
-
-// This is yet another naming algorithm based on webservices.jar
-// They always use the binding namespace as the package name
-// of the BindingImpl class.
-public static String getPackageNameForBindingImpl(Port port)
-{
- if (port != null)
- {
- Binding binding = port.getBinding();
-// PortType portType = binding.getPortType();
- QName bndQName = binding.getQName();
- String namespace = bndQName.getNamespaceURI();
- return namespaceURI2PackageName(namespace);
- }
- return "";
-}
-
-/**
-* Get the namespace for the Port Type
-*
-*/
-public static String getPortTypeNamespace(Definition definition)
-{
- String namespace = "";
- if (definition != null)
- {
- Service service = (Service) definition.getServices().values().iterator().next();
- Iterator iterator = service.getPorts().values().iterator();
- while(iterator.hasNext()){
- Port port = (Port) iterator.next();
- for (int i=0; i<port.getExtensibilityElements().size();i++) {
- if (port.getExtensibilityElements().get(i) instanceof SOAPAddress){
- PortType portType = port.getBinding().getPortType();
- QName bndQName = portType.getQName();
- namespace = bndQName.getNamespaceURI();
- }
- }
- }
- }
- return namespace;
-}
-
-// This is yet another naming algorithm based on webservices.jar
-// They always use the porttype namespace as the package name
-// of the Java class (in ejb).
-public static String getPackageNameForPortType(Definition definition)
-{
- if (definition != null)
- {
- String namespace = getPortTypeNamespace(definition);
- return namespaceURI2PackageName(namespace);
- }
- return "";
-}
-
- /**
- * checks if the input string is a valid java keyword.
- * @return boolean true/false
- */
- public static boolean isJavaKeyword(String keyword) {
- return (Arrays.binarySearch(keywords, keyword, englishCollator) >= 0);
- }
-
- /**
- * Turn a java keyword string into a non-Java keyword string. (Right now
- * this simply means appending an underscore.)
- */
- public static String makeNonJavaKeyword(String keyword){
- return keywordPrefix + keyword;
- }
-
- public static String getFullyQualifiedPortTypeName(Definition definition)
- {
- StringBuffer beanName = new StringBuffer();
- beanName.append(getPackageNameForPortType(definition));
- beanName.append(DOT);
- beanName.append(getPortTypeName(definition));
- return beanName.toString();
-
- }
-
- /**
- * getName
- * @param uri String
- * @return get the file name after the last \ and /
- */
- public static String getName(String uri) {
-
- // Get everything after last slash or backslash
- int bslash = uri.lastIndexOf("\\");
- int slash = uri.lastIndexOf("/");
- int i = bslash > slash ? bslash : slash;
- String fileName = uri.substring(i+1).replace('?', '.');
-
- return fileName;
- }
-
-
-/**
- * getWSDLName
- * @param uri String
- * @return get the file name after the last \ and /, trimmed, defaulted to
- * "default.wsdl" if there is no name, and ending with ".wsdl".
- */
- public static String getWSDLName(String uri) {
-
- // Get everything after last slash or backslash from input URI
- // with no whitespace.
- String WSDLName = getName(uri).trim();
-
- // if empty, return the default "default.wsdl"
- if ( WSDLName.equals( "" ) ) {
- WSDLName = "default.wsdl";
- }
-
- // make sure name ends with ".wsdl", lower case.
- else {
- if ( ! WSDLName.endsWith( ".wsdl" ) ) {
- if ( WSDLName.toLowerCase().endsWith( ".wsdl" ) ) {
- int lastDot = WSDLName.lastIndexOf(".");
- WSDLName = WSDLName.substring( 0, lastDot ) + ".wsdl";
- }
- else {
- WSDLName = WSDLName + ".wsdl";
- }
- }
- }
-
- return WSDLName;
- }
-
- /**
- * getPortTypeNameFromBeanName
- * @param beanname String
- * @return get the port type name based on the bean name
- */
- public static String getPortTypeNameFromBeanName(String beanName) {
- return beanName.substring(beanName.lastIndexOf('.') + 1);
- }
-
- public static String getPackageName(Service service, Map ns2pkgMap)
- {
- if (service != null)
- {
- String namespace = service.getQName().getNamespaceURI();
- if (ns2pkgMap != null)
- {
- Object pkg = ns2pkgMap.get(namespace);
- if (pkg != null)
- return (String)pkg;
- }
- return namespaceURI2PackageName(namespace);
- }
- else
- return "";
- }
-
- public static String getPackageName(Port port, Map ns2pkgMap)
- {
- if (port != null)
- return getPackageName(port.getBinding(), ns2pkgMap);
- else
- return "";
- }
-
- public static String getPackageName(Binding binding, Map ns2pkgMap)
- {
- if (binding != null)
- {
- String namespace = binding.getQName().getNamespaceURI();
- if (ns2pkgMap != null)
- {
- Object pkg = ns2pkgMap.get(namespace);
- if (pkg != null)
- return (String)pkg;
- }
- return namespaceURI2PackageName(namespace);
- }
- else
- return "";
- }
-
- public static String getPackageName(PortType portType, Map ns2pkgMap)
- {
- if (portType != null)
- {
- String namespace = portType.getQName().getNamespaceURI();
- if (ns2pkgMap != null)
- {
- Object pkg = ns2pkgMap.get(namespace);
- if (pkg != null)
- return (String)pkg;
- }
- return namespaceURI2PackageName(namespace);
- }
- else
- return "";
- }
-
-
- /**
- * namespaceURI2PackageName
- * @param namespaceURI
- * @return package name based on namespace
- */
- public static String namespaceURI2PackageName(String namespaceURI)
- {
- /**
- * TODO: The makePackageName method from
- * org.apache.axis.wsdl.toJava.Utils in axis-1_1 is called to map namespace to package name.
- * This will be replaced with an extension point to plug in runtime emitter specific namespace to
- * package mapping algorithm
- */
- return Utils.makePackageName(namespaceURI);
-
-// StringBuffer sb = new StringBuffer(80);
-// if (namespaceURI != null && namespaceURI.length() > 0)
-// {
-// String hostname = null;
-// try
-// {
-// hostname = new URL(namespaceURI).getHost();
-// }
-// catch (MalformedURLException e)
-// {
-// int index = namespaceURI.indexOf(":");
-// if (index > -1)
-// {
-// hostname = namespaceURI.substring(index+1);
-// index = hostname.indexOf("/");
-// if (index > -1)
-// hostname = hostname.substring(0, index);
-// }
-// else
-// hostname = namespaceURI;
-// }
-//
-// // if we didn't file a hostname, bail
-// if (hostname == null) {
-// return null;
-// }
-//
-// //convert illegal java identifier
-// hostname = hostname.replace('-', '_');
-// // tokenize the hostname and reverse it
-// StringTokenizer st = new StringTokenizer(hostname, ".");
-// String[] words = new String[st.countTokens()];
-// for (int i = 0; i < words.length; ++i)
-// words[i] = st.nextToken();
-// for(int i = words.length-1; i >= 0; --i)
-// {
-// String word = words[i];
-// if (isJavaKeyword(word))
-// word = makeNonJavaKeyword(word);
-// // seperate with dot
-// if (i != words.length-1)
-// sb.append('.');
-// // convert digits to underscores
-// if (Character.isDigit(word.charAt(0)))
-// sb.append('_');
-// sb.append(word);
-// }
-// }
-// return normalizePackageName(sb.toString(), DOT.charAt(0));
- }
-
-
- public static String resolveDotInPortName(String name) {
- if(name.indexOf(".")<0)
- {
- return name;
- }
- StringBuffer sb = new StringBuffer();
- boolean afterDot = false;
- for(int i=0; i<name.length(); i++)
- {
- if(name.charAt(i)=='.')
- {
- afterDot = true;
- }
- else if(afterDot)
- {
- sb.append(name.substring(i,i+1).toUpperCase());
- afterDot=false;
- }
- else
- {
- sb.append(name.charAt(i));
- }
- }
- return sb.toString();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsFragment.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsFragment.java
deleted file mode 100644
index c3d34c3..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsFragment.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.widgets;
-
-import org.eclipse.wst.command.internal.env.core.common.Condition;
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-
-
-public class AxisMappingsFragment extends BooleanFragment
-{
- private boolean showMappings_;
-
- public AxisMappingsFragment()
- {
- super();
- setTrueFragment( new SimpleFragment( "AxisMappingsWidget" ));
- setCondition( new Condition()
- {
- public boolean evaluate()
- {
- return showMappings_;
- }
- } );
- }
-
- public void setShowMapping( boolean showMappings )
- {
- showMappings_ = showMappings;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsWidget.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsWidget.java
deleted file mode 100644
index bad11ef..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsWidget.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20080616 235648 makandre@ca.ibm.com - Andrew Mak, Errors in client proxy if using default namespace to package mapping
- * 20080917 247561 mahutch@ca.ibm.com - Mark Hutchinson, Error if whitespace entered in mapping page
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.widgets;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.TableViewerWidget;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-
-public class AxisMappingsWidget extends SimpleWidgetDataContributor
-{
- private String pluginId_ = "org.eclipse.jst.ws.axis.consumption.ui";
-
- private TableViewerWidget mappings_;
-
- private byte mode_;
- private JavaWSDLParameter javaParameter_;
-
- public static final byte MODE_BEAN2XML = (byte)0;
- public static final byte MODE_XML2BEAN = (byte)1;
- public static final byte MODE_XML2PROXY = (byte)2;
- public static final byte MODE_XML2EJB = (byte)3;
- public static final byte MODE_EJB2XML = (byte)4;
-
- private final String DEFAULT_PACKAGE = "custom.javapackage";
- private final String DEFAULT_NAMESPACE = "http://custom.namespace";
-
- /*CONTEXT_ID PWJM0001 for the WSDL to Java Mappings Page*/
- private String INFOPOP_PWJM_PAGE = "PWJM0001"; //$NON-NLS-1$
-
- public AxisMappingsWidget( byte mode )
- {
- mode_ = mode;
- }
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener )
- {
-
- // TODO The TOOLTIP_PWJM_PAGE key doesn't seem to exist anywhere???
- //parent.setToolTipText( msgUtils.getMessage( "TOOLTIP_PWJM_PAGE" ) );
- PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId_ + "." + INFOPOP_PWJM_PAGE );
-
- Text mappingLabel = new Text( parent, SWT.READ_ONLY | SWT.WRAP );
- mappingLabel.setText( AxisConsumptionUIMessages.LABEL_MAPPING_PAIRS );
- mappingLabel.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
-
- List initValues = new ArrayList();
-
- if( mode_ == MODE_BEAN2XML || mode_ == MODE_EJB2XML)
- {
- String[] columns = { AxisConsumptionUIMessages.TABLE_COLUMN_LABEL_PACKAGE,
- AxisConsumptionUIMessages.TABLE_COLUMN_LABEL_NAMESPACE};
- mappings_ = new TableViewerWidget( columns, initValues, new String[] {DEFAULT_PACKAGE, DEFAULT_NAMESPACE}, TableViewerWidget.MAP_ONE_TO_ONE); //$NON-NLS-1$
- }
- else
- {
- String[] columns = { AxisConsumptionUIMessages.TABLE_COLUMN_LABEL_NAMESPACE,
- AxisConsumptionUIMessages.TABLE_COLUMN_LABEL_PACKAGE};
- mappings_ = new TableViewerWidget( columns, initValues, new String[] {DEFAULT_NAMESPACE, DEFAULT_PACKAGE }, TableViewerWidget.MAP_MANY_TO_ONE); //$NON-NLS-1$
- }
-
- mappings_.addControls( parent, statusListener );
-
- return this;
- }
-
- public IStatus getStatus()
- {
- return mappings_.getStatus();
- }
-
- public void setJavaParameter( JavaWSDLParameter parameter )
- {
- javaParameter_ = parameter;
- }
-
- public JavaWSDLParameter getJavaParameter()
- {
- if( mode_ == MODE_BEAN2XML || mode_ == MODE_EJB2XML || mode_ == MODE_XML2BEAN || mode_ == MODE_XML2PROXY)
- {
- //Set the mappings on javaParameter
- TableItem[] pairs = mappings_.getItems();
- HashMap map = new HashMap();
- for (int i=0; i<pairs.length; i++)
- {
- map.put(pairs[i].getText(0).trim(),pairs[i].getText(1).trim());
- }
- javaParameter_.setMappings(map);
-
- //Set the namespace on the javaParameter
- String beanName = javaParameter_.getBeanName();
- if(beanName != null && !beanName.equals(""))
- {
- String packageName = beanName.substring(0, beanName.lastIndexOf('.'));
- if(map.containsKey(packageName))
- {
- String tns = (String)map.get(packageName);
- javaParameter_.setNamespace(tns);
- }
- }
-
- }
- return javaParameter_;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisProxyWidget.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisProxyWidget.java
deleted file mode 100644
index bc08bf1..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisProxyWidget.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060216 115144 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.widgets;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-
-public class AxisProxyWidget extends SimpleWidgetDataContributor
-{
- private String pluginId_ = "org.eclipse.jst.ws.axis.consumption.ui";
-
- /*CONTEXT_ID PWJB0001 for the WSDL to Java Bindings Page*/
- private final String INFOPOP_PWJB_PAGE = "PWJB0001"; //$NON-NLS-1$
-
- private Combo outputFolderCombo_;
- /*CONTEXT_ID PWJB0003 for the Folder field of the WSDL to Java Bindings Page*/
- private final String INFOPOP_PWJB_TEXT_FOLDER = "PWJB0003"; //$NON-NLS-1$
-
- private Button genProxyCheckbox_;
- /*CONTEXT_ID PWJB0009 Indicates whether to generate a proxy or not. */
- private final String INFOPOP_PWJB_CHECKBOX_GENPROXY = "PWJB0009"; //$NON-NLS-1$
-
- private Button showMappingsCheckbox_;
- /*CONTEXT_ID PWJB0016 for the Show Mappings checkbox of the Bean Methods Page*/
- private String INFOPOP_N2P_SHOW_MAPPINGS = "PWJB0016"; //$NON-NLS-1$
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener )
- {
- UIUtils uiUtils = new UIUtils( pluginId_ );
-
- parent.setToolTipText( AxisConsumptionUIMessages.TOOLTIP_PWJB_PAGE );
- PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId_ + "." + INFOPOP_PWJB_PAGE);
-
- genProxyCheckbox_ = uiUtils.createCheckbox( parent, AxisConsumptionUIMessages.CHECKBOX_GENPROXY,
- AxisConsumptionUIMessages.TOOLTIP_PWJB_CHECKBOX_GENPROXY,
- INFOPOP_PWJB_CHECKBOX_GENPROXY );
- genProxyCheckbox_.addListener( SWT.Selection, statusListener );
- genProxyCheckbox_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleGenProxy();
- }
- });
-
- Composite textGroup = uiUtils.createComposite( parent, 2, 5, 0 );
-
- outputFolderCombo_ = uiUtils.createCombo( textGroup, AxisConsumptionUIMessages.LABEL_FOLDER_NAME,
- AxisConsumptionUIMessages.TOOLTIP_PWJB_TEXT_FOLDER,
- INFOPOP_PWJB_TEXT_FOLDER,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-
- showMappingsCheckbox_ = uiUtils.createCheckbox( parent, AxisConsumptionUIMessages.LABEL_EXPLORE_MAPPINGS_XML2BEAN,
- AxisConsumptionUIMessages.TOOLTIP_N2P_SHOW_MAPPINGS,
- INFOPOP_N2P_SHOW_MAPPINGS );
- // Since this widget affects whether the next page is shown or not we
- // need to add the statusListener.
- showMappingsCheckbox_.addListener( SWT.Selection, statusListener );
-
- return this;
- }
-
- private void handleGenProxy()
- {
- boolean enabled = genProxyCheckbox_.getSelection();
-
- outputFolderCombo_.setEnabled( enabled );
- showMappingsCheckbox_.setEnabled( enabled );
- }
-
- public void setClientProject(IProject clientProject)
- {
- IPath[] paths = ResourceUtils.getAllJavaSourceLocations(clientProject);
-
- for (int i = 0; i < paths.length ; i++)
- {
- outputFolderCombo_.add(paths[i].toString());
- }
-
- if( paths.length > 0 )
- {
- outputFolderCombo_.select(0);
- }
- }
-
- public String getOutputFolder()
- {
- return outputFolderCombo_.getText();
- }
-
- public void setGenerateProxy( Boolean genProxy )
- {
- genProxyCheckbox_.setSelection( genProxy.booleanValue() );
- }
-
- public Boolean getGenerateProxy()
- {
- return new Boolean( genProxyCheckbox_.getSelection() );
- }
-
- public void setCustomizeClientMappings( boolean showMappings )
- {
- showMappingsCheckbox_.setSelection( showMappings );
- }
-
- public boolean getCustomizeClientMappings()
- {
- return showMappingsCheckbox_.getSelection() && genProxyCheckbox_.getSelection();
- }
-
- public void setIsClientScenario( boolean isClientScenario )
- {
- genProxyCheckbox_.setEnabled( !isClientScenario );
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/client/WebServiceClientAxisType.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/client/WebServiceClientAxisType.java
deleted file mode 100644
index bd851ad..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/client/WebServiceClientAxisType.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060216 115144 pmoogk@ca.ibm.com - Peter Moogk
- * 20060523 143284 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client;
-
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientDefaultingCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.DefaultsForClientJavaWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.ClientCodeGenOperation;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisMappingsWidget;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisProxyWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionOutputCommand;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-
-
-/**
- * Developers who are adding web service clients into the wizard should create
- * a class that implements this interface.
-**/
-public class WebServiceClientAxisType implements CommandWidgetBinding
-{
-
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- // AxisClientDefaultingCommand
- dataRegistry.addMapping( AxisClientDefaultingCommand.class, "CustomizeClientMappings", AxisProxyWidget.class );
- dataRegistry.addMapping( AxisClientDefaultingCommand.class, "ProxyProjectFolder", AxisProxyWidget.class, "ProxyFolder", null );
- dataRegistry.addMapping( AxisClientDefaultingCommand.class, "GenerateProxy", AxisProxyWidget.class);
- dataRegistry.addMapping( AxisClientDefaultingCommand.class, "IsClientScenario", AxisProxyWidget.class);
- dataRegistry.addMapping( AxisClientDefaultingCommand.class, "ClientProject", AxisProxyWidget.class );
- dataRegistry.addMapping( AxisClientDefaultingCommand.class, "JavaWSDLParam", AxisMappingsWidget.class, "JavaParameter", null);
-
- // AxisProxyWidget
- dataRegistry.addMapping( AxisProxyWidget.class, "GenerateProxy", ClientExtensionOutputCommand.class );
- dataRegistry.addMapping( AxisProxyWidget.class, "OutputFolder", DefaultsForClientJavaWSDLCommand.class );
-
- //AxisMappingsWidget
- dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", DefaultsForHTTPBasicAuthCommand.class, "JavaWSDLParam", null); //OK
- dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", DefaultsForClientJavaWSDLCommand.class, "JavaWSDLParam", null); //OK
- dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", ValidateWSDLCommand.class, "JavaWSDLParam", null); //OK
- dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", ClientCodeGenOperation.class, "JavaWSDLParam", null); //OK
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
- */
- public void registerWidgetMappings(WidgetRegistry widgetRegistry)
- {
-
- widgetRegistry.add( "AxisClientStart",
- AxisConsumptionUIMessages.PAGE_TITLE_WS_AXIS_PROXY,
- AxisConsumptionUIMessages.PAGE_DESC_WS_AXIS_PROXY,
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new AxisProxyWidget();
- }
- } );
-
- widgetRegistry.add( "AxisClientBeanMapping",
- AxisConsumptionUIMessages.PAGE_TITLE_WS_XML2PROXY,
- AxisConsumptionUIMessages.LABEL_EXPLORE_MAPPINGS_XML2BEAN,
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new AxisMappingsWidget(AxisMappingsWidget.MODE_XML2PROXY );
- }
- } );
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactoryFactory#create()
- */
- public CommandFragmentFactory create()
- {
- return new CommandFragmentFactory()
- {
- public CommandFragment create()
- {
- //dead code - doesn't matter what gets returned here.
- return new SimpleFragment();
- }
- };
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
- */
- public void registerCanFinish(CanFinishRegistry canFinishRegistry)
- {
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisClientConfigWidgetFactory.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisClientConfigWidgetFactory.java
deleted file mode 100644
index cdb7e9f..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisClientConfigWidgetFactory.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.consumption.ui.wsrt;
-
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisProxyWidget;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client.WebServiceClientAxisType;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetBindingToWidgetFactoryAdapter;
-
-public class AxisClientConfigWidgetFactory implements INamedWidgetContributorFactory {
-
- private INamedWidgetContributor proxyConfigWidget_;
- private INamedWidgetContributor mappingsWidget_;
- private AxisProxyWidget proxyWidget_;
- private WidgetBindingToWidgetFactoryAdapter adapter_;
-
- public AxisClientConfigWidgetFactory()
- {
- adapter_ = new WidgetBindingToWidgetFactoryAdapter( new WebServiceClientAxisType() );
-
- proxyConfigWidget_ = adapter_.getWidget( "AxisClientStart" );
- proxyWidget_ = (AxisProxyWidget)proxyConfigWidget_.getWidgetContributorFactory().create();
- mappingsWidget_ = adapter_.getWidget( "AxisClientBeanMapping" );
- }
-
- public INamedWidgetContributor getFirstNamedWidget()
- {
- return proxyConfigWidget_;
- }
-
- public INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor)
- {
- return widgetContributor == proxyConfigWidget_ && proxyWidget_.getCustomizeClientMappings() ? mappingsWidget_ : null;
- }
-
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- adapter_.registerDataMappings( dataRegistry );
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisWebServiceClient.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisWebServiceClient.java
deleted file mode 100644
index e645096..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisWebServiceClient.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060216 115144 pmoogk@ca.ibm.com - Peter Moogk
- * 20060509 125094 sengpl@ca.ibm.com - Seng Phung-Lu, Use WorkspaceModifyOperation
- * 20060515 115225 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060728 145426 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.consumption.ui.wsrt;
-
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientDefaultingCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientInputCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientOutputCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.DefaultsForClientJavaWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.ClientCodeGenOperation;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand;
-import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-import org.eclipse.wst.command.internal.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.ws.internal.wsrt.AbstractWebServiceClient;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceClientInfo;
-
-public class AxisWebServiceClient extends AbstractWebServiceClient
-{
-
- public AxisWebServiceClient(WebServiceClientInfo info)
- {
- super(info);
- // TODO Auto-generated constructor stub
- }
-
- public ICommandFactory assemble(IEnvironment env, IContext ctx,
- ISelection sel, String project, String earProject)
- {
- return null;
- }
-
- public ICommandFactory deploy(IEnvironment env, IContext ctx, ISelection sel,
- String project, String earProject)
- {
- return null;
- }
-
- public ICommandFactory develop(IEnvironment env, IContext ctx, ISelection sel,
- String project, String earProject)
- {
- EclipseEnvironment environment = (EclipseEnvironment)env;
- registerDataMappings( environment.getCommandManager().getMappingRegistry());
-
- Vector commands = new Vector();
- commands.add(new AxisClientInputCommand(this, ctx, project));
- commands.add(new AxisClientDefaultingCommand());
-// commands.add(new SimpleFragment("AxisClientStart"));
-// commands.add(new SimpleFragment("AxisClientBeanMapping"));
- commands.add(new DefaultsForHTTPBasicAuthCommand());
-// commands.add(new CopyAxisJarCommand());
- commands.add(new DefaultsForClientJavaWSDLCommand());
- commands.add(new ValidateWSDLCommand());
- commands.add(new ClientCodeGenOperation());
- commands.add(new AxisClientOutputCommand(this,ctx));
- commands.add(new BuildProjectCommand());
- return new SimpleCommandFactory(commands);
- }
-
- public ICommandFactory install(IEnvironment env, IContext ctx, ISelection sel,
- String project, String earProject)
- {
- return null;
- }
-
- public ICommandFactory run(IEnvironment env, IContext ctx, ISelection sel,
- String project, String earProject)
- {
- return null;
- }
-
- public void registerDataMappings(DataMappingRegistry registry)
- {
- // AxisClientDefaultingCommand
- registry.addMapping(AxisClientInputCommand.class, "ClientProject", AxisClientDefaultingCommand.class, "ClientProject",
- new StringToIProjectTransformer());
-// registry.addMapping(ClientExtensionDefaultingCommand.class, "ClientRuntime", AxisClientDefaultingCommand.class, "ClientRuntimeID",
-// null);
-// registry.addMapping(ClientExtensionDefaultingCommand.class, "WebServicesParser", AxisClientDefaultingCommand.class);
-// registry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", AxisClientDefaultingCommand.class,
-// "ClientProjectEAR", new StringToIProjectTransformer());
- registry.addMapping(AxisClientInputCommand.class, "WsdlURL", AxisClientDefaultingCommand.class); // URI
- // to
- // URL
- // transformer
- // req'd??
-// registry.addMapping(ClientExtensionDefaultingCommand.class, "TestProxySelected", AxisClientDefaultingCommand.class,
-// "TestProxySelected", null);
- registry.addMapping(AxisClientInputCommand.class, "ClientServer", AxisClientDefaultingCommand.class);
-// registry.addMapping(ClientExtensionDefaultingCommand.class, "IsClientScenario", AxisClientDefaultingCommand.class);
- registry.addMapping(AxisClientInputCommand.class, "GenerateProxy", AxisClientDefaultingCommand.class);
- // DefaultsForHTTPBasicAuthCommand()
- registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", DefaultsForHTTPBasicAuthCommand.class); //OK
- registry.addMapping(AxisClientDefaultingCommand.class, "WsdlURL", DefaultsForHTTPBasicAuthCommand.class, "WsdlServiceURL", null); //OK
- registry.addMapping(AxisClientDefaultingCommand.class, "WebServicesParser", DefaultsForHTTPBasicAuthCommand.class); //OK
-
-// registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", CopyAxisJarCommand.class, "Project", null);
-
- // DefaultsForClientJavaWSDLCommand() // javaParam_, model_
- registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", DefaultsForClientJavaWSDLCommand.class);
- registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", DefaultsForClientJavaWSDLCommand.class, "ProxyProject",
- null);
- // registry.addMapping(AxisClientDefaultingCommand.class, "WsdlURL",
- // DefaultsForClientJavaWSDLCommand.class,"WSDLServicePathname",null);
- // //
- // URL to URL??
- registry.addMapping(AxisClientDefaultingCommand.class, "WsdlURL", DefaultsForClientJavaWSDLCommand.class, "WSDLServiceURL", null); // URI
- // to
- // URL??
- // ValidateWSDLCommand()
- registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", ValidateWSDLCommand.class);
- registry.addMapping(AxisClientDefaultingCommand.class, "WsdlServiceURL", ValidateWSDLCommand.class);
- registry.addMapping(AxisClientDefaultingCommand.class, "WebServicesParser", ValidateWSDLCommand.class);
-
- // WSDL2JavaCommand() // javaParam_
- registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", ClientCodeGenOperation.class);
- registry.addMapping(AxisClientDefaultingCommand.class, "WsdlURL", ClientCodeGenOperation.class, "WsdlURI", null);
-
- // RefreshProjectCommand()
- registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", ClientCodeGenOperation.class, "Project", null);
-
- // Stub2BeanCommand()
- registry.addMapping(AxisClientDefaultingCommand.class, "WebServicesParser", ClientCodeGenOperation.class);
- registry.addMapping(DefaultsForClientJavaWSDLCommand.class, "OutputFolder", ClientCodeGenOperation.class );
-
- // BuildProjectCommand()
- registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", BuildProjectCommand.class, "Project", null);
- registry.addMapping(AxisClientDefaultingCommand.class, "ForceBuild", BuildProjectCommand.class);
- registry.addMapping(AxisClientDefaultingCommand.class, "ValidationManager", BuildProjectCommand.class);
-
- registry.addMapping(ClientCodeGenOperation.class, "ProxyBean", AxisClientOutputCommand.class, "ProxyBean", null);
- registry.addMapping(ClientCodeGenOperation.class, "ProxyEndpoint", AxisClientOutputCommand.class);
-// registry.addMapping(AxisClientDefaultingCommand.class, "GenerateProxy", ClientExtensionOutputCommand.class);
-// registry.addMapping(AxisClientDefaultingCommand.class, "SetEndpointMethod", ClientExtensionOutputCommand.class);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/.classpath b/bundles/org.eclipse.jst.ws.axis.creation.ui/.classpath
deleted file mode 100644
index 196d49a..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/.cvsignore b/bundles/org.eclipse.jst.ws.axis.creation.ui/.cvsignore
deleted file mode 100644
index c726c35..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-build.xml
-temp.folder
-wss-axis-ui.jar
-@dot
-src.zip
-javaCompiler...args
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/.project b/bundles/org.eclipse.jst.ws.axis.creation.ui/.project
deleted file mode 100644
index 39e93a9..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.axis.creation.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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.jst.ws.axis.creation.ui/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 5c6dd85..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Wed Sep 26 06:28:27 EDT 2007
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.axis.creation.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c63622d..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Thu May 31 13:11:16 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.jst.ws.axis.creation.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 74dbba7..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 30 10:41:30 EST 2006
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index d7418f4..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,52 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.axis.creation.ui; singleton:=true
-Bundle-Version: 1.0.600.qualifier
-Bundle-Activator: org.eclipse.jst.ws.internal.axis.creation.ui.plugin.WebServiceAxisCreationUIPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.axis.creation.ui;x-internal:=true,
- org.eclipse.jst.ws.internal.axis.creation.ui.command;x-internal:=true,
- org.eclipse.jst.ws.internal.axis.creation.ui.plugin;x-internal:=true,
- org.eclipse.jst.ws.internal.axis.creation.ui.task;x-internal:=true,
- org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean;x-internal:=true,
- org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton;x-internal:=true,
- org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans;x-internal:=true,
- org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl;x-internal:=true,
- org.eclipse.jst.ws.internal.axis.creation.ui.wsrt;x-internal:=true
-Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jem;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.wst.ws.parser;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.jst.ws;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.jst.ws.consumption.ui;bundle-version="[1.1.300,1.2.0)",
- org.eclipse.jst.ws.consumption;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.jst.ws.ui;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.jst.ws.axis.consumption.core;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.jst.ws.axis.consumption.ui;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.wst.command.env.core;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.wst.command.env;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.wst.command.env.ui;bundle-version="[1.0.101,1.2.0)",
- org.eclipse.wst.server.core;bundle-version="[1.0.102,2.0.0)",
- org.eclipse.wst.ws;bundle-version="[1.0.100,1.2.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.jst.j2ee.web;bundle-version="[1.1.0,1.2.0)",
- javax.wsdl;bundle-version="[1.5.0,1.6.0)",
- org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.wsdl;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.4.100,2.0.0)",
- org.eclipse.jst.jee;bundle-version="[1.0.300,2.0.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/about.html b/bundles/org.eclipse.jst.ws.axis.creation.ui/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/build.properties b/bundles/org.eclipse.jst.ws.axis.creation.ui/build.properties
deleted file mode 100644
index 391fee0..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-bin.includes = .,\
- plugin.properties,\
- plugin.xml,\
- META-INF/,\
- deploy.xsl,\
- about.html
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/deploy.xsl b/bundles/org.eclipse.jst.ws.axis.creation.ui/deploy.xsl
deleted file mode 100644
index 3fdf164..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/deploy.xsl
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="1.0"
- xmlns:xalan="http://xml.apache.org/xslt"
- xmlns:ns1="http://xml.apache.org/axis/wsdd/"
- xmlns:java="http://xml.apache.org/axis/wsdd/providers/java">
- <xsl:output method="xml" encoding="UTF-8"/>
-
- <xsl:param name="newClassName" select="ss"/>
-
- <xsl:template match="/ns1:deployment/ns1:service/ns1:parameter[@name='className']">
- <xsl:copy>
- <xsl:attribute name="name">className</xsl:attribute>
- <xsl:attribute name="value">
- <xsl:value-of select="$newClassName"/>
- </xsl:attribute>
- <xsl:apply-templates/>
- </xsl:copy>
- </xsl:template>
-
- <xsl:template match="@*|node()">
- <xsl:copy>
- <xsl:apply-templates select="@*|node()"/>
- </xsl:copy>
- </xsl:template>
-</xsl:stylesheet>
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.properties b/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.properties
deleted file mode 100644
index b18a796..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Webservice Axis Creation UI
-PLUGIN_PROVIDER=Eclipse Web Tools Platform
-
-LABEL_RUNTIME_AXIS_11=Apache Axis
-DESC_RUNTIME_AXIS_11=Apache Axis
-
-#
-#WSWSDLAxisType
-#
-WS_NAME_WSDLAXIS=Skeleton Java bean Axis Web service
-
-#
-#WSBeanAxisType
-#
-WS_NAME_BEANAXIS=Java bean Axis Web service
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.xml b/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.xml
deleted file mode 100644
index ccb1955..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
- <!-- Server Defaulters -->
-
- <extension point="org.eclipse.jst.ws.consumption.serverDefaulter">
- <serverDefaulter
- class="org.eclipse.jst.ws.internal.axis.creation.ui.command.AxisServerDefaulter">
- </serverDefaulter>
- </extension>
-
- <!--
- <extension point="org.eclipse.jst.ws.consumption.ui.webServiceRuntime">
- <webServiceRuntime
- id="org.eclipse.jst.ws.axis.creation.axisWebServiceRT"
- label="%LABEL_RUNTIME_AXIS_11"
- serviceTypes="org.eclipse.jst.ws.serviceType.java"
- clientTypes="org.eclipse.jst.ws.clientType.java.webOnly"
- servletLevels="23 24"
- j2eeLevels="13 14"
- servers="org.eclipse.jst.server.tomcat.40 org.eclipse.jst.server.tomcat.41 org.eclipse.jst.server.tomcat.50 org.eclipse.jst.server.tomcat.55 org.eclipse.jst.server.geronimo.10"
- class="org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisWebServiceRuntime">
- </webServiceRuntime>
- </extension>
- -->
-
- <extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
- <widgetFactory
- id="AxisBeanConfig"
- insertBeforeCommandId="org.eclipse.jst.ws.internal.axis.creation.ui.task.BUConfigCommand"
- class="org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisBeanConfigWidgetFactory"/>
- </extension>
-
- <extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
- <widgetFactory
- id="AxisSkeletonConfig"
- insertBeforeCommandId="org.eclipse.jst.ws.internal.axis.creation.ui.task.TDConfigCommand"
- class="org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisSkeletonConfigWidgetFactory"/>
- </extension>
-
- <!-- M9 extensions -->
- <extension point="org.eclipse.jst.ws.consumption.ui.runtimes">
- <runtime
- id="org.eclipse.jst.ws.axis.creation.axisWebServiceRT"
- label="%LABEL_RUNTIME_AXIS_11"
- serverRequired="false"/>
- </extension>
-
-
- <extension point="org.eclipse.jst.ws.consumption.ui.serviceRuntimeProperties">
- <serviceRuntimeProperties serviceRuntimeId="org.eclipse.jst.ws.axis.creation.java">
- <unsuitable-project-template id="template.jst.connector" />
- <unsuitable-project-template id="template.jst.ejb" />
- <unsuitable-project-template id="template.jst.webfragment" />
- <unsuitable-project-template id="template.jst.appclient" />
- <unsuitable-project-template id="template.jst.utility" />
- </serviceRuntimeProperties>
- </extension>
-
- <extension point="org.eclipse.jst.ws.consumption.ui.clientRuntimeProperties">
- <clientRuntimeProperties clientRuntimeId="org.eclipse.jst.ws.axis.consumption.web">
- <unsuitable-project-template id="template.jst.connector" />
- <unsuitable-project-template id="template.jst.ejb" />
- <unsuitable-project-template id="template.jst.webfragment" />
- <unsuitable-project-template id="template.jst.appclient" />
- <unsuitable-project-template id="template.jst.utility" />
- </clientRuntimeProperties>
- <clientRuntimeProperties clientRuntimeId="org.eclipse.jst.ws.axis.consumption.java">
- <unsuitable-project-template id="template.jst.connector" />
- <unsuitable-project-template id="template.jst.ejb" />
- <unsuitable-project-template id="template.jst.webfragment" />
- <unsuitable-project-template id="template.jst.web" />
- <unsuitable-project-template id="template.jst.appclient" />
- </clientRuntimeProperties>
- </extension>
-
-
- <!-- define support for Axis Java bean bottom up and top-down support in web projects -->
- <extension point="org.eclipse.jst.ws.consumption.ui.serviceRuntimes">
- <serviceRuntime
- id="org.eclipse.jst.ws.axis.creation.java"
- serviceImplementationTypeId="org.eclipse.jst.ws.wsImpl.java"
- runtimeId="org.eclipse.jst.ws.axis.creation.axisWebServiceRT"
- runtimeChecker="org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisWebServiceRuntimeChecker"
- bottomUp="true"
- topDown="true"
- class="org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisWebServiceRuntime">
-
- <required-facet-version facet="jst.web" version="2.3" allow-newer="true"/>
-
- </serviceRuntime>
- </extension>
-
- <!-- define support for Axis Java clients in Java projects -->
- <extension point="org.eclipse.jst.ws.consumption.ui.clientRuntimes">
- <clientRuntime
- id="org.eclipse.jst.ws.axis.consumption.java"
- clientImplementationTypeId="org.eclipse.jst.ws.client.type.java"
- runtimeId="org.eclipse.jst.ws.axis.creation.axisWebServiceRT"
- class="org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisWebServiceRuntime">
-
- <required-facet-version facet="jst.utility" version="1.0" allow-newer="true"/>
-
- </clientRuntime>
- </extension>
-
- <!-- define support for Axis Java clients in Web projects -->
- <extension point="org.eclipse.jst.ws.consumption.ui.clientRuntimes">
- <clientRuntime
- id="org.eclipse.jst.ws.axis.consumption.web"
- clientImplementationTypeId="org.eclipse.jst.ws.client.type.java"
- runtimeId="org.eclipse.jst.ws.axis.creation.axisWebServiceRT"
- class="org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisWebServiceRuntime">
-
- <required-facet-version facet="jst.web" version="2.3" allow-newer="true"/>
-
- </clientRuntime>
- </extension>
-
- <!-- extend WebServiceSampleTest to support the Axis client runtimes -->
- <extension point="org.eclipse.jst.ws.consumption.ui.tester">
- <tester
- id="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WebServiceSampleTest"
- supportedClientRuntimes="org.eclipse.jst.ws.axis.consumption.web org.eclipse.jst.ws.axis.consumption.java">
- </tester>
- </extension>
-
- <extension
- point="org.eclipse.wst.command.env.antDataMapping">
- <map
- key="InitialSelection"
- operation="org.eclipse.jst.ws.internal.axis.creation.ui.task.DefaultsForServerJavaWSDLCommand"
- property="ObjectSelection"
- transform="org.eclipse.jst.ws.internal.common.String2SelectionTransformer"/>
- <map
- key="JavaOutput"
- operation="org.eclipse.jst.ws.internal.axis.creation.ui.command.BUCodeGenOperation"
- property="JavaWSDLParam"
- transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
- <map
- key="Mappings"
- operation="org.eclipse.jst.ws.internal.axis.creation.ui.command.BUCodeGenOperation"
- property="JavaWSDLParam"
- transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
- <map
- key="Methods"
- operation="org.eclipse.jst.ws.internal.axis.creation.ui.command.BUCodeGenOperation"
- property="JavaWSDLParam"
- transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
- <map
- key="Style"
- operation="org.eclipse.jst.ws.internal.axis.creation.ui.command.BUCodeGenOperation"
- property="JavaWSDLParam"
- transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
- <map
- key="Use"
- operation="org.eclipse.jst.ws.internal.axis.creation.ui.command.BUCodeGenOperation"
- property="JavaWSDLParam"
- transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
-
- <map
- key="JavaOutput"
- operation="org.eclipse.jst.ws.internal.axis.creation.ui.command.TDCodeGenOperation"
- property="JavaWSDLParam"
- transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
- <map
- key="Mappings"
- operation="org.eclipse.jst.ws.internal.axis.creation.ui.command.TDCodeGenOperation"
- property="JavaWSDLParam"
- transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
- <map
- key="Methods"
- operation="org.eclipse.jst.ws.internal.axis.creation.ui.command.TDCodeGenOperation"
- property="JavaWSDLParam"
- transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
- <map
- key="Style"
- operation="org.eclipse.jst.ws.internal.axis.creation.ui.command.TDCodeGenOperation"
- property="JavaWSDLParam"
- transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
- <map
- key="Use"
- operation="org.eclipse.jst.ws.internal.axis.creation.ui.command.TDCodeGenOperation"
- property="JavaWSDLParam"
- transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
- </extension>
-
-</plugin>
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/AxisCreationUI.properties b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/AxisCreationUI.properties
deleted file mode 100644
index 1db0f50..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/AxisCreationUI.properties
+++ /dev/null
@@ -1,105 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 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
-# yyyymmdd bug Email and other contact information
-# -------- -------- -----------------------------------------------------------
-# 20060216 126989 pmoogk@ca.ibm.com - Peter Moogk
-# 20060329 128827 kathy@ca.ibm.com - Kathy Chan
-# 20060329 124667 kathy@ca.ibm.com - Kathy Chan
-# 20060607 144978 kathy@ca.ibm.com - Kathy Chan
-# 20070509 182274 kathy@ca.ibm.com - Kathy Chan
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-
-#
-# Error messages used in this plugin
-#
-MSG_ERROR_PROJECT_URL=IWAB0514E Unable to get URL for project {0}
-MSG_ERROR_CANNOT_NO_JAVA_BEAN=IWAB0015E A Java bean was not selected
-MSG_ERROR_NO_PROJECT=IWAB0016E A project was not selected
-MSG_ERROR_CANNOT_LOAD_JAVA_BEAN=IWAB0017E The Java bean, {0}, cannot be loaded from {1}
-MSG_ERROR_JAVA_MOF_REFLECT_FAILED=IWAB0521E Failed to analyze the Java bean: {0}.
-MSG_ERROR_READ_BEAN=IWAB0522E Error in reading methods from Java bean.
-MSG_ERROR_UPDATE_AXIS_WSDD=IWAB0524E Error updating Axis deploy.wsdd file
-
-#
-#JavaToWSDLMethodCommand
-#
-MSG_ERROR_JAVA_TO_METHOD=IWAB0019E Error in getting method from Java bean.
-
-#
-#UpdateWEBXMLCommand
-#
-MSG_ERROR_UPDATE_WEB_XML=IWAB0020E Error in adding servlet in web.xml.
-
-#
-#UpdateAxisWSDDFileTask
-#
-MSG_PLUGIN_FILE_URL=Problem locating plugin file
-
-#
-#WebServiceWSDLAxisSelectionPage
-#
-PAGE_MSG_NO_FILE_SPECIFIED=No file specified.
-PAGE_MSG_NO_METHOD_SELECTED=No methods selected.
-
-#
-#WebServiceSkeletonAxisConfigPage
-#
-TOOLTIP_PBSC_PAGE=
-TOOLTIP_PBCF_TEXT_URI=The SOAP body namespace and unique identifier of the Web service.
-TOOLTIP_PBCF_TEXT_WSDL_FOLDER=The folder of the WSDL file.
-TOOLTIP_PBCF_TEXT_WSDL_FILE=The name of the WSDL file.
-LABEL_URI=Web service URI:
-LABEL_OUTPUT_FOLDER_NAME=WSDL folder:
-LABEL_OUTPUT_FILE_NAME=WSDL file:
-
-#
-#WebServiceAxisBeanClassPage
-#
-PAGE_TITLE_WSBEAN_CLASS=Web Service Java Bean Selection
-PAGE_DESC_WSBEAN_CLASS=Select a Java bean
-LABEL_EXPLORE_MAPPINGS_BEAN2XML=Define custom mapping for package to namespace.
-TOOLTIP_P2N_SHOW_MAPPINGS=Define package to namespace mapping for customization.
-
-#
-#WebServiceAxisBeanConfigPage
-#
-TOOLTIP_PBCF_PAGE=
-TOOLTIP_PBME_TREE_METHODS=Java bean methods to include.
-PAGE_TITLE_WSBEAN_CONFIG=Web Service Java Bean Identity
-PAGE_DESC_WSBEAN_CONFIG=Configure the Java bean as a Web service.
-LABEL_STYLE_USE=Style and use
-STYLE_RPC_LITERAL=document/literal
-STYLE_DOC_LITERAL=document/literal (wrapped)
-STYLE_RPC_ENCODED=RPC/encoded
-
-#
-# AxisCheckCompilerLevelCommand
-#
-MSG_ERROR_COMPILER_LEVEL_NOT_COMPATIBLE=The workbench is running on Java VM version {0}, however, the compiler compliance level of \
-the project "{1}" is set to Java version {2}. \
-Generation of a Web service from Java cannot proceed because the tools will be unable to process the class file compiled within the project. \
-To correct the problem, take one of the following actions: \
-\n1. Open project properties, select Project Facets, and use Add/Remove Project Facet to change Java version to {0} or lower.\
-\n2. Restart the workbench on a version {2} Java VM.
-
-#
-# ModifyWSDLEndpointAddressCommand
-#
-MSG_ERROR_MODIFY_ENDPOINT=Error in modifying the soap:address location URI for WSDL file {0}.
-
-#
-# Messages for ValidateWSIComplianceCommand
-#
-WSI_INCOMPLIANCE_RPC_ENCODED=RPC Encoded is selected
-
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/AxisCreationUIMessages.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/AxisCreationUIMessages.java
deleted file mode 100644
index d037eab..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/AxisCreationUIMessages.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060329 128827 kathy@ca.ibm.com - Kathy Chan
- * 20060329 124667 kathy@ca.ibm.com - Kathy Chan
- * 20060607 144978 kathy@ca.ibm.com - Kathy Chan
- * 20070509 182274 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class AxisCreationUIMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jst.ws.internal.axis.creation.ui.AxisCreationUI";//$NON-NLS-1$
-
- private AxisCreationUIMessages() {
- // Do not instantiate
- }
-
- public static String MSG_ERROR_PROJECT_URL;
- public static String MSG_ERROR_CANNOT_NO_JAVA_BEAN;
- public static String MSG_ERROR_NO_PROJECT;
- public static String MSG_ERROR_CANNOT_LOAD_JAVA_BEAN;
- public static String MSG_ERROR_JAVA_MOF_REFLECT_FAILED;
- public static String MSG_ERROR_READ_BEAN;
- public static String MSG_ERROR_UPDATE_AXIS_WSDD;
- public static String MSG_ERROR_JAVA_TO_METHOD;
- public static String MSG_ERROR_UPDATE_WEB_XML;
- public static String MSG_PLUGIN_FILE_URL;
- public static String PAGE_MSG_NO_FILE_SPECIFIED;
- public static String PAGE_MSG_NO_METHOD_SELECTED;
- public static String TOOLTIP_PBSC_PAGE;
- public static String TOOLTIP_PBCF_TEXT_URI;
- public static String TOOLTIP_PBCF_TEXT_WSDL_FOLDER;
- public static String TOOLTIP_PBCF_TEXT_WSDL_FILE;
- public static String LABEL_URI;
- public static String LABEL_OUTPUT_FOLDER_NAME;
- public static String LABEL_OUTPUT_FILE_NAME;
- public static String PAGE_TITLE_WSBEAN_CLASS;
- public static String PAGE_DESC_WSBEAN_CLASS;
- public static String LABEL_EXPLORE_MAPPINGS_BEAN2XML;
- public static String TOOLTIP_P2N_SHOW_MAPPINGS;
- public static String TOOLTIP_PBCF_PAGE;
- public static String TOOLTIP_PBME_TREE_METHODS;
- public static String PAGE_TITLE_WSBEAN_CONFIG;
- public static String PAGE_DESC_WSBEAN_CONFIG;
- public static String LABEL_STYLE_USE;
- public static String STYLE_RPC_LITERAL;
- public static String STYLE_DOC_LITERAL;
- public static String STYLE_RPC_ENCODED;
- public static String MSG_ERROR_COMPILER_LEVEL_NOT_COMPATIBLE;
- public static String MSG_ERROR_MODIFY_ENDPOINT;
- public static String WSI_INCOMPLIANCE_RPC_ENCODED;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, AxisCreationUIMessages.class);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisCheckCompilerLevelCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisCheckCompilerLevelCommand.java
deleted file mode 100644
index 28363ed..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisCheckCompilerLevelCommand.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.axis.creation.ui.AxisCreationUIMessages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * Check to make sure that the project containing the service bean is not at a compiler compliance setting
- * that's higher than the Java VM the workbench is launched with.
- */
-public class AxisCheckCompilerLevelCommand extends AbstractDataModelOperation {
-
- private String serverProject_;
-
- /**
- * Default CTOR
- */
- public AxisCheckCompilerLevelCommand() {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.operations.IUndoableOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- */
- public IStatus execute(IProgressMonitor monitor, IAdaptable adaptable) {
-
- IStatus status = Status.OK_STATUS;
- String javaSpecVersion = System.getProperty("java.specification.version");
- if (javaSpecVersion != null)
- {
- IProject project = ProjectUtilities.getProject(serverProject_);
- IJavaProject javaProject = JavaCore.create(project);
- if (javaProject != null)
- {
- String projectCompilerLevel = javaProject.getOption("org.eclipse.jdt.core.compiler.compliance", false);
- if (projectCompilerLevel == null)
- {
- projectCompilerLevel = (String)JavaCore.getDefaultOptions().get("org.eclipse.jdt.core.compiler.compliance");
- }
- if (projectCompilerLevel != null)
- {
- if (!compilerLevelsCompatible(javaSpecVersion, projectCompilerLevel)) {
- status = StatusUtils.errorStatus( NLS.bind(AxisCreationUIMessages.MSG_ERROR_COMPILER_LEVEL_NOT_COMPATIBLE, new String[] {javaSpecVersion, serverProject_, projectCompilerLevel}));
- getEnvironment().getStatusHandler().reportError(status);
- }
- }
- }
- }
- return status;
- }
-
- /**
- * Returns true if and only if the Java specification level
- * of the Eclipse JRE (<code>javaSpecVersion</code> is not
- * lower than the Java specification level of the compiler
- * (<code>projectCompilerLevel</code>.
- * @param javaSpecVersion The Java Specification Version of the JRE.
- * @param projectCompilerLevel The Java project's compiler level.
- * @return True if the Java specification level of the project's
- * compiler does not exceed the Java specification level of the
- * JRE that Eclipse is running on, and false otherwise.
- */
- private boolean compilerLevelsCompatible(String javaSpecVersion, String projectCompilerLevel) {
- return (javaSpecVersion.compareTo(projectCompilerLevel) >= 0);
- }
-
- /**
- * Sets the project whose compiler level should be checked.
- * @param serverProject The project whose compiler level should be checked.
- */
- public void setServerProject(String serverProject) {
- serverProject_ = serverProject;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisOutputCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisOutputCommand.java
deleted file mode 100644
index 956da3c..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisOutputCommand.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisWebService;
-import org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisWebServiceInfo;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class AxisOutputCommand extends AbstractDataModelOperation {
-
- private AxisWebService ws_;
- private JavaWSDLParameter javaWSDLParam_;
-
- private String wsdlURI_;
-
- /**
- * Default CTOR
- */
- public AxisOutputCommand() {
- }
-
- public AxisOutputCommand(AxisWebService ws) {
- ws_ = ws;
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IStatus status = Status.OK_STATUS;
- ws_.getWebServiceInfo().setWsdlURL(wsdlURI_);
- AxisWebServiceInfo axisWSInfo = new AxisWebServiceInfo();
- axisWSInfo.setJavaWSDLParameter(javaWSDLParam_);
- ws_.setAxisWebServiceInfo(axisWSInfo);
-
- return status;
- }
-
- /**
- * @param wsdlURI
- * The wsdlURI to set.
- */
- public void setWsdlURI(String wsdlURI)
- {
- wsdlURI_ = wsdlURI;
- }
-
- public void setJavaWSDLParam (JavaWSDLParameter javaWSDLParam_) {
- this.javaWSDLParam_ = javaWSDLParam_;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisRunInputCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisRunInputCommand.java
deleted file mode 100644
index 6967480..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisRunInputCommand.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060330 124667 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisWebService;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class AxisRunInputCommand extends AbstractDataModelOperation{
-
- private AxisWebService ws_;
- private JavaWSDLParameter javaWSDLParam_;
- private String serverProject_;
- private String serverInstanceId_;
- private String serverFactoryId_;
- private String wsdlURI_;
-
- public AxisRunInputCommand() {
- }
-
- public AxisRunInputCommand(AxisWebService ws, String project) {
- ws_ = ws;
- serverProject_ = project;
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- javaWSDLParam_ = ws_.getAxisWebServiceInfo().getJavaWSDLParameter();
- serverInstanceId_ = ws_.getWebServiceInfo().getServerInstanceId();
- serverFactoryId_ = ws_.getWebServiceInfo().getServerFactoryId();
- wsdlURI_ = ws_.getWebServiceInfo().getWsdlURL();
-
- return Status.OK_STATUS;
- }
-
- /**
- * @return Returns the serverProject.
- */
- public String getServerProject()
- {
- return serverProject_;
- }
-
- public JavaWSDLParameter getJavaWSDLParam() {
- return javaWSDLParam_;
- }
-
- public String getServerInstanceId() {
- return serverInstanceId_;
- }
-
- public String getServerFactoryId() {
- return serverFactoryId_;
- }
-
- public String getWsdlURI() {
- return wsdlURI_;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisServerDefaulter.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisServerDefaulter.java
deleted file mode 100644
index b378b6b..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisServerDefaulter.java
+++ /dev/null
@@ -1,29 +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.ws.internal.axis.creation.ui.command;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.ws.internal.consumption.common.IServerDefaulter;
-import org.eclipse.jst.ws.internal.consumption.common.ServerInfo;
-
-
-
-public class AxisServerDefaulter implements IServerDefaulter
-{
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.consumption.common.IServerDefaulter#recommendDefaultServer(org.eclipse.core.resources.IProject)
- */
- public ServerInfo recommendDefaultServer(IProject project)
- {
- return null;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/BUAxisInputCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/BUAxisInputCommand.java
deleted file mode 100644
index c193e2a..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/BUAxisInputCommand.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060419 132905 cbrealey@ca.ibm.com - Chris Brealey
- * 20061004 159356 kathy@ca.ibm.com - Kathy Chan, Get correct module root URL based on server chosen
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.context.AxisEmitterContext;
-import org.eclipse.jst.ws.internal.axis.consumption.core.plugin.WebServiceAxisConsumptionCorePlugin;
-import org.eclipse.jst.ws.internal.conformance.JAXRPCWebServiceAnalyzer;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.StatusException;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-
-
-public class BUAxisInputCommand extends AbstractDataModelOperation {
-
- private IWebService ws_;
- private String serverProject_;
- private String javaBeanName_;
-
- private String serviceServerTypeID_;
- private IServer serviceExistingServer_ = null;
-
- /**
- * Default CTOR
- */
- public BUAxisInputCommand() {
- }
-
- public BUAxisInputCommand(IWebService ws, String project) {
- ws_ = ws;
- serverProject_ = project;
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
-
- String serverInstanceId = ws_.getWebServiceInfo().getServerInstanceId();
- String serverFactoryId = ws_.getWebServiceInfo().getServerFactoryId();
- javaBeanName_ = ws_.getWebServiceInfo().getImplURL();
-
- // The following "if" block drives validation of the given
- // Java service class (javaBeanName_) against JAX-RPC if the
- // JAX-RPC validation preference is switched on.
- // For the most part, the JAX-RPC analyzer returns warnings
- // for violations of the JAX-RPC spec, and errors only if
- // actual JDT model navigation fails due to bad classpaths.
- // This allows users the choice of heeding or ignoring the
- // messages returned by the analyzer.
- IEnvironment environment = getEnvironment();
- AxisEmitterContext context = WebServiceAxisConsumptionCorePlugin.getInstance().getAxisEmitterContext();
- if (javaBeanName_ != null && context.isValidateAgainstJAXRPCEnabled())
- {
- JAXRPCWebServiceAnalyzer analyzer = new JAXRPCWebServiceAnalyzer();
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(serverProject_);
- if (project != null)
- {
- IStatus status = analyzer.analyze(project,javaBeanName_,monitor);
- if (!status.isOK())
- {
- try
- {
- environment.getStatusHandler().report(status);
- }
- catch (StatusException e)
- {
- return new Status(IStatus.ERROR,"org.eclipse.jst.ws",0,"",null);
- }
- }
- }
- }
-
- if (serverInstanceId != null) { // server exists
- serviceExistingServer_ = ServerCore.findServer(serverInstanceId);
- if (serviceExistingServer_ != null)
- {
- serviceServerTypeID_ = serviceExistingServer_.getServerType().getId();
- }
- }
- else
- {
- serviceServerTypeID_ = serverFactoryId;
- }
-
- return Status.OK_STATUS;
- }
-
- /**
- * @return Returns the serverProject.
- */
- public String getServerProject()
- {
- return serverProject_;
- }
-
- public String getServiceServerTypeID()
- {
- return serviceServerTypeID_;
- }
-
- public String getJavaBeanName() {
- return javaBeanName_;
- }
-
- public IServer getServiceExistingServer()
- {
- return serviceExistingServer_;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/BUCodeGenOperation.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/BUCodeGenOperation.java
deleted file mode 100644
index 540bc93..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/BUCodeGenOperation.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- *
- * 20060509 125094 sengpl@ca.ibm.com - Seng Phung-Lu, Use WorkspaceModifyOperation
- * 20060515 115225 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060517 142327 kathy@ca.ibm.com - Kathy Chan
- * 20100420 307152 kchong@ca.ibm.com - Keith Chong, Web Service deployment fails without web.xml
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.Java2WSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CopyAxisJarCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.RefreshProjectCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.UpdateAxisWSDDFileTask;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class BUCodeGenOperation extends AbstractDataModelOperation {
-
- // CopyAxisJarCommand
- private CopyAxisJarCommand copyAxisJarCommand = null;
-
- // Java2WSDLCommand
- private Java2WSDLCommand java2WSDLCommand = null;
- private JavaWSDLParameter javaWSDLParam;
- private String wsdlURI;
-
- // wsdl2JavaCommand
- private WSDL2JavaCommand wsdl2JavaCommand = null;
-
- // UpdateAxisWSDDFileTask
- private UpdateAxisWSDDFileTask updateAxisWsddCommand = null;
- private IProject serviceProject;
-
- // UpdateWEBXMLCommand
- private UpdateWEBXMLCommand updateWebXMLCommand = null;
-
- // RefreshProjectCommand
- private RefreshProjectCommand refreshProjectCommand = null;
-
- // CreateDeploymentDescriptorCommand
- private CreateDeploymentDescriptorCommand createDDCommand = null;
-
-
- /**
- * This command runs the commands in the constructor in a WorkspaceModifyOperation.
- * The commands are listed above, along with their relevant data registry parameters
- * @param java2WSDL
- * @param wsdl2Java
- * @param updateAxisWsdd
- * @param updateWebXML
- */
- public BUCodeGenOperation(){
- copyAxisJarCommand = new CopyAxisJarCommand();
- java2WSDLCommand = new Java2WSDLCommand();
- wsdl2JavaCommand = new WSDL2JavaCommand();
- updateAxisWsddCommand = new UpdateAxisWSDDFileTask();
- updateWebXMLCommand = new UpdateWEBXMLCommand();
- refreshProjectCommand = new RefreshProjectCommand();
- createDDCommand = new CreateDeploymentDescriptorCommand();
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) {
-
- IEnvironment env = getEnvironment();
- BottomUpWSModifyOperation buOperation = new BottomUpWSModifyOperation(info, env);
- try {
- buOperation.execute(monitor);
- }
- catch(CoreException ce){
- IStatus status = ce.getStatus();
- return status;
- }
- return Status.OK_STATUS;
-
- }
-
- private class BottomUpWSModifyOperation extends WorkspaceModifyOperation {
-
- private IAdaptable info = null;
- private IEnvironment env = null;
-
-
- protected BottomUpWSModifyOperation(IAdaptable adaptable, IEnvironment environment){
- info = adaptable;
- env = environment;
- }
-
- protected void execute(IProgressMonitor monitor) throws CoreException{
-
- IStatus status = null;
-
- // CopyAxisJarCommand
- copyAxisJarCommand.setEnvironment(env);
- copyAxisJarCommand.setProject(serviceProject);
- status = copyAxisJarCommand.execute(monitor, info);
- if (status.getSeverity() == Status.ERROR){
- throw new CoreException(status);
- }
-
- // Java2WSDLCommand
- java2WSDLCommand.setEnvironment(env);
- java2WSDLCommand.setJavaWSDLParam(javaWSDLParam);
- status = java2WSDLCommand.execute(monitor, info);
- if (status.getSeverity() == Status.ERROR) {
- throw new CoreException(status);
- }
- wsdlURI = java2WSDLCommand.getWsdlURI();
-
- // WSDL2JavaCommand
- wsdl2JavaCommand.setEnvironment(env);
- wsdl2JavaCommand.setJavaWSDLParam(javaWSDLParam);
- status = wsdl2JavaCommand.execute(monitor, info);
- if (status.getSeverity() == Status.ERROR) {
- throw new CoreException(status);
- }
- javaWSDLParam = wsdl2JavaCommand.getJavaWSDLParam();
-
- // UpdateAxisWsddCommand
- updateAxisWsddCommand.setEnvironment(env);
- updateAxisWsddCommand.setJavaWSDLParam(javaWSDLParam);
- updateAxisWsddCommand.setServiceProject(serviceProject);
- status = updateAxisWsddCommand.execute(monitor, info);
- if (status.getSeverity() == Status.ERROR) {
- throw new CoreException(status);
- }
- javaWSDLParam = updateAxisWsddCommand.getJavaWSDLParam();
-
- // create the deployment descriptor if it doesn't exist
- createDDCommand.setEnvironment(env);
- createDDCommand.setServerProject(serviceProject);
- status = createDDCommand.execute(monitor, info);
- if (status.getSeverity() == Status.ERROR) {
- throw new CoreException(status);
- }
-
- // UpdateWebXMLCommand
- updateWebXMLCommand.setEnvironment(env);
- updateWebXMLCommand.setServerProject(serviceProject);
- status = updateWebXMLCommand.execute(monitor, info);
- if (status.getSeverity() == Status.ERROR) {
- throw new CoreException(status);
- }
-
- // RefreshProjectCommand
- refreshProjectCommand.setEnvironment(env);
- refreshProjectCommand.setProject(serviceProject);
- status = refreshProjectCommand.execute(monitor, info);
- if (status.getSeverity() == Status.ERROR) {
- throw new CoreException(status);
- }
-
-
- }
-
- }
-
- public String getWsdlURI() {
- return wsdlURI;
- }
-
- public JavaWSDLParameter getJavaWSDLParam() {
- return javaWSDLParam;
- }
-
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
- this.javaWSDLParam = javaWSDLParam;
- }
-
- public void setServiceProject(IProject serviceProject) {
- this.serviceProject = serviceProject;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/CopyDeploymentFileCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/CopyDeploymentFileCommand.java
deleted file mode 100644
index 4efe846..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/CopyDeploymentFileCommand.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060524 130755 kathy@ca.ibm.com - Kathy Chan
- * 20061221 168787 kathy@ca.ibm.com - Kathy Chan
- * 20070815 188999 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.axis.consumption.core.AxisConsumptionCoreMessages;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.env.eclipse.BaseEclipseEnvironment;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.IStatusHandler;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.internal.IModulePublishHelper;
-
-/**
- *
- * This command copies the server-config.wsdd file to it's proper location in the module.
- *
- */
-
-public class CopyDeploymentFileCommand extends AbstractDataModelOperation
-{
- private final String WEB_INF = "WEB-INF";
- private final String SERVER_CONFIG = "server-config.wsdd";
- private String projectName_;
- private String EARProjectName_;
- private String serverInstanceId_;
-
- /**
- * Constructor for CopyDeploymentFileCommand.
- * @param String description
- * @param String name
- *
- */
- public CopyDeploymentFileCommand( String projectName, String earProjectName )
- {
- projectName_ = projectName;
- EARProjectName_ = earProjectName;
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IStatus status = Status.OK_STATUS;
- IEnvironment environment = getEnvironment();
-
- FileInputStream finStream = null;
- try
- {
-
- IVirtualComponent component = J2EEUtils.getVirtualComponent( projectName_ );
- IServer server = ServerCore.findServer( serverInstanceId_ );
- IProject project = ProjectUtilities.getProject(projectName_);
- IModule projectModule = ServerUtil.getModule(project);
-
- if (server != null && component != null && projectModule != null) {
- IModulePublishHelper publishHelper = (IModulePublishHelper)
- server.loadAdapter(IModulePublishHelper.class, monitor);
- if (publishHelper != null) {
- IModule[] serverModules;
- if (EARProjectName_ == null) {
- serverModules = new IModule [] {projectModule};
- } else {
- IProject EARProject = ProjectUtilities.getProject(EARProjectName_);
- IModule EARProjectModule = ServerUtil.getModule(EARProject);
- serverModules = new IModule [] {EARProjectModule, projectModule};
- }
- IPath publishDirPath = publishHelper.getPublishDirectory(serverModules);
-
- if (publishDirPath != null) {
- IVirtualFolder rootFolder = component.getRootFolder();
- IPath rootFolderPath = ResourceUtils.getWorkspaceRoot().getFile(rootFolder.getWorkspaceRelativePath()).getLocation();
- if (rootFolderPath != null) {
- File rootFolderFile = rootFolderPath.toFile();
- File publishDirFile = publishDirPath.toFile();
- if (!rootFolderFile.equals(publishDirFile)) {
- // copy the server-config.wsdd if the publish directory is not in the same as the project root folder
- IPath path = new Path( WEB_INF ).append( SERVER_CONFIG );
- IPath serverConfigPath = publishDirPath.append(path);
- if (serverConfigPath != null) {
- IVirtualFile newLocation = rootFolder.getFile(path);
- IPath targetPath = newLocation.getWorkspaceRelativePath();
- if (targetPath != null) {
- finStream = new FileInputStream(serverConfigPath.toString());
- if (finStream != null)
- {
- IStatusHandler statusHandler = environment.getStatusHandler();
- ResourceContext context = ((BaseEclipseEnvironment)environment).getResourceContext();
-
- FileResourceUtils.createFile(context,
- targetPath,
- finStream,
- monitor,
- statusHandler);
- finStream.close();
- }
- }
- }
- }
- }
- }
- }
- }
- }
- catch( Throwable e )
- {
- status = StatusUtils.errorStatus(NLS.bind(AxisConsumptionCoreMessages.MSG_ERROR_MOVE_RESOURCE, new String[]{e.getLocalizedMessage()}), e);
- environment.getStatusHandler().reportError(status);
- } finally {
- if (finStream != null) {
- try {
- finStream.close();
- } catch (IOException e) {
- }
- }
- }
-
- return status;
-
- }
-
- public void setServerInstanceId(String serverInstanceId) {
- this.serverInstanceId_ = serverInstanceId;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/CreateDeploymentDescriptorCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/CreateDeploymentDescriptorCommand.java
deleted file mode 100644
index 4aae82e..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/CreateDeploymentDescriptorCommand.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20100420 307152 kchong@ca.ibm.com - Keith Chong, Web Service deployment fails without web.xml
- *
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.jee.project.facet.IAppClientCreateDeploymentFilesDataModelProperties;
-import org.eclipse.jst.jee.project.facet.IConnectorCreateDeploymentFilesDataModelProperties;
-import org.eclipse.jst.jee.project.facet.ICreateDeploymentFilesDataModelProperties;
-import org.eclipse.jst.jee.project.facet.IEJBCreateDeploymentFilesDataModelProperties;
-import org.eclipse.jst.jee.project.facet.IEarCreateDeploymentFilesDataModelProperties;
-import org.eclipse.jst.jee.project.facet.IWebCreateDeploymentFilesDataModelProperties;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class CreateDeploymentDescriptorCommand extends AbstractDataModelOperation {
-
- private IProject project;
-
- public CreateDeploymentDescriptorCommand() {
- super();
- }
-
- public CreateDeploymentDescriptorCommand(IDataModel model) {
- super(model);
- }
-
- public void setServerProject(IProject serverProject)
- {
- this.project = serverProject;
- }
-
- protected boolean hasDeploymentDescriptor(IProject project) {
- boolean ret = true;
- IPath ddFilePath = null;
- if (JavaEEProjectUtilities.isEARProject(project)) {
- ddFilePath = new Path(J2EEConstants.APPLICATION_DD_URI);
- } else if (JavaEEProjectUtilities.isEJBProject(project)) {
- ddFilePath = new Path(J2EEConstants.EJBJAR_DD_URI);
- } else if (JavaEEProjectUtilities.isDynamicWebProject(project)) {
- ddFilePath = new Path(J2EEConstants.WEBAPP_DD_URI);
- } else if (JavaEEProjectUtilities.isApplicationClientProject(project)) {
- ddFilePath = new Path(J2EEConstants.APP_CLIENT_DD_URI);
- } else if (JavaEEProjectUtilities.isJCAProject(project)) {
- ddFilePath = new Path(J2EEConstants.RAR_DD_URI);
- }
- IVirtualComponent component = ComponentCore.createComponent(project);
- if (component.getRootFolder() != null
- && component.getRootFolder().getUnderlyingFolder() != null) {
- IFile ddXmlFile = component.getRootFolder().getUnderlyingFolder()
- .getFile(ddFilePath);
- ret = ddXmlFile.exists();
- }
- return ret;
- }
-
- protected IDataModel getDataModel(IProject project) {
- Class dataModelClass = null;
- if (JavaEEProjectUtilities.isEARProject(project)) {
- dataModelClass = IEarCreateDeploymentFilesDataModelProperties.class;
- } else if (JavaEEProjectUtilities.isEJBProject(project)) {
- dataModelClass = IEJBCreateDeploymentFilesDataModelProperties.class;
- } else if (JavaEEProjectUtilities.isDynamicWebProject(project)) {
- dataModelClass = IWebCreateDeploymentFilesDataModelProperties.class;
- } else if (JavaEEProjectUtilities.isApplicationClientProject(project)) {
- dataModelClass = IAppClientCreateDeploymentFilesDataModelProperties.class;
- } else if (JavaEEProjectUtilities.isJCAProject(project)) {
- dataModelClass = IConnectorCreateDeploymentFilesDataModelProperties.class;
- }
- IDataModel dataModel = DataModelFactory.createDataModel(dataModelClass);
- dataModel.setProperty(
- ICreateDeploymentFilesDataModelProperties.TARGET_PROJECT,
- project);
- return dataModel;
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) {
-
- IEnvironment environment = getEnvironment();
- IStatus status = Status.OK_STATUS;
- if (project != null && !hasDeploymentDescriptor(project)) {
- try {
- getDataModel(project).getDefaultOperation().execute(new NullProgressMonitor(), null);
- } catch (ExecutionException e) {
- status = StatusUtils.errorStatus(e.getMessage(), e);
- }
- }
- if (status.getSeverity() == Status.ERROR) {
- environment.getStatusHandler().reportError(status);
- return status;
- }
- return status;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/JavaToWSDLMethodCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/JavaToWSDLMethodCommand.java
deleted file mode 100644
index 8c3418e..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/JavaToWSDLMethodCommand.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.creation.ui.AxisCreationUIMessages;
-import org.eclipse.jst.ws.internal.common.JavaMOFUtils;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class JavaToWSDLMethodCommand extends AbstractDataModelOperation {
-
- private static String JAVA_EXTENSION = ".java"; //$NON-NLS-1$
- private static String CLASS_EXTENSION = ".class"; //$NON-NLS-1$
-
- private Hashtable fMethodNames;
- private String fClassName;
- private String fbeanBaseName;
- private JavaWSDLParameter javaWSDLParam_;
- private IProject serviceProject_;
-
- /**
- * Default CTOR
- */
- public JavaToWSDLMethodCommand() {
- }
- /**
- * Default CTOR
- */
- public JavaToWSDLMethodCommand(
- JavaWSDLParameter javaParameter,
- IProject serviceProject) {
- javaWSDLParam_ = javaParameter;
- serviceProject_ = serviceProject;
-
- }
-
- /**
- * JavaToToWSDLMethod execute
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
-
- fbeanBaseName = javaWSDLParam_.getBeanName();
- environment.getLog().log(ILog.INFO, 5070, this, "execute", "beanBaseName = "+fbeanBaseName);
- IStatus status;
- try {
- //Get the qualified bean name; my.package.MyClass
- fMethodNames = new Hashtable();
- Hashtable oldMethodsNames = javaWSDLParam_.getMethods();
- String qName = fbeanBaseName;
-
- if (qName.toLowerCase().endsWith(JAVA_EXTENSION)
- || qName.toLowerCase().endsWith(CLASS_EXTENSION)) {
- qName = qName.substring(0, qName.lastIndexOf('.'));
- }
-
- JavaClass javaClass = JavaMOFUtils.getJavaClass(qName, serviceProject_);
-
- if (!javaClass.isExistingType()) {
- environment.getLog().log(ILog.ERROR, 5022, this, "execute",
- NLS.bind(AxisCreationUIMessages.MSG_ERROR_JAVA_MOF_REFLECT_FAILED,
- new String[] { qName }));
-
- status = StatusUtils.errorStatus(
- NLS.bind(AxisCreationUIMessages.MSG_ERROR_JAVA_MOF_REFLECT_FAILED,
- new String[] { qName }));
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- // Get the qualified name
- fClassName = javaClass.getQualifiedName();
- String beanName;
- if (fClassName.lastIndexOf('.') != -1) {
- beanName =
- fClassName.substring(
- fClassName.lastIndexOf('.') + 1,
- fClassName.length());
- } else
- beanName = fClassName;
-
- // Walk the java class and get the method names
- gatherMethods(javaClass, beanName, oldMethodsNames);
- /*
- Iterator m = javaClass.getPublicMethodsExtended().iterator();
- while (m.hasNext()) {
- Method method = (Method) m.next();
- if ( ! method.isConstructor()){
- if (!beanName.equals(method.getName())
- && !(isDuplicateMethodName(method
- .getMethodElementSignature()))
- && !(method
- .getContainingJavaClass()
- .getJavaName()
- .equalsIgnoreCase("javax.ejb.EJBObject")) //$NON-NLS-1$
- && !(method
- .getContainingJavaClass()
- .getJavaName()
- .equalsIgnoreCase("javax.ejb.EJBObject[]")) //$NON-NLS-1$
- && !(method
- .getContainingJavaClass()
- .getJavaName()
- .equalsIgnoreCase("java.lang.Object")) //$NON-NLS-1$
- && !(method
- .getContainingJavaClass()
- .getJavaName()
- .equalsIgnoreCase("java.lang.Object[]"))) { //$NON-NLS-1$
- // add the method name to our list of method names
- String methodName =method.getMethodElementSignature();
- Boolean isSelected = new Boolean(true);
- if (oldMethodsNames != null && oldMethodsNames.containsKey(methodName))
- isSelected = (Boolean)oldMethodsNames.get(methodName);
- fMethodNames.put(methodName, isSelected);
- }
- }
- }
- */
- javaWSDLParam_.setMethods(fMethodNames);
-
- return Status.OK_STATUS;
-
- } catch (Exception e) {
- environment.getLog().log(ILog.ERROR, 5023, this, "execute", AxisCreationUIMessages.MSG_ERROR_READ_BEAN);
-
- status = StatusUtils.errorStatus(AxisCreationUIMessages.MSG_ERROR_JAVA_TO_METHOD, e);
- environment.getStatusHandler().reportError(status);
- return status;
- }
- }
-
- private void gatherMethods(JavaClass javaClass, String beanName, Hashtable oldMethodsNames)
- {
- String javaName = javaClass.getJavaName();
- if (!javaClass.isInterface()
- && !javaName.equalsIgnoreCase("javax.ejb.EJBObject[]")
- && !javaName.equalsIgnoreCase("javax.ejb.EJBObject")
- && !javaName.equalsIgnoreCase("java.lang.Object[]")
- && !javaName.equalsIgnoreCase("java.lang.Object"))
- {
- List publicMethods = javaClass.getPublicMethods();
- for (Iterator it = publicMethods.iterator(); it.hasNext();)
- {
- Method method = (Method)it.next();
- if (!method.isConstructor()
- && !beanName.equals(method.getName())
- && !(isDuplicateMethodName(method.getMethodElementSignature())))
- {
- // add the method name to our list of method names
- String methodName = method.getMethodElementSignature();
- Boolean isSelected = new Boolean(true);
- if (oldMethodsNames != null && oldMethodsNames.containsKey(methodName))
- isSelected = (Boolean)oldMethodsNames.get(methodName);
- fMethodNames.put(methodName, isSelected);
- }
- }
- gatherMethods(javaClass.getSupertype(), beanName, oldMethodsNames);
- }
- }
-
- //Returns true if the provided method name already exists in the
- //fMethodNames vector. This method is used to detect overloaded
- //methods in Beans and EJBs, which are currently unsupported.
- private boolean isDuplicateMethodName(String methodName) {
- return (fMethodNames == null ? false: fMethodNames.containsKey(methodName));
- }
-
- /**
- * Returns the javaWSDLParam.
- * @return JavaWSDLParameter
- */
- public JavaWSDLParameter getJavaWSDLParam() {
- return javaWSDLParam_;
- }
-
- /**
- * Sets the javaWSDLParam.
- * @param javaWSDLParam The javaWSDLParam to set
- */
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
- this.javaWSDLParam_ = javaWSDLParam;
- }
-
- public void setServiceProject(IProject serviceProject)
- {
- serviceProject_ = serviceProject;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/ModifyWSDLEndpointAddressCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/ModifyWSDLEndpointAddressCommand.java
deleted file mode 100644
index 4b4f026..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/ModifyWSDLEndpointAddressCommand.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060515 115225 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-import java.io.OutputStream;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLWriter;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.creation.ui.AxisCreationUIMessages;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.wsdl.internal.impl.wsdl4j.WSDLFactoryImpl;
-
-public class ModifyWSDLEndpointAddressCommand extends AbstractDataModelOperation {
-
- private String serverInstanceId;
- private String serverFactoryId;
- private IProject serviceProject;
- private String wsdlURI;
- private WebServicesParser webServicesParser;
- public final String SERVICE_EXT = "/services/"; //$NON-NLS-1$
- private JavaWSDLParameter javaWSDLParam;
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable adaptable) {
- IStatus status;
- IEnvironment environment = getEnvironment();
- try {
- // the correct project URL has already been obtained, no need to modify <soap:address> location URI
- if (!javaWSDLParam.isGuessProjectURL()) {
- return Status.OK_STATUS;
- }
-
- String projectURL = null;
-
- IServer server = null;
- if(serverInstanceId!=null) {
- server = ServerCore.findServer(serverInstanceId);
- }
-
- if(server!=null) {
- projectURL = ServerUtils.getEncodedWebComponentURL(serviceProject, serverFactoryId, server);
- } else {
- projectURL = ServerUtils.getEncodedWebComponentURL(serviceProject, serverFactoryId);
- }
-
- if(projectURL==null || projectURL.trim().length()==0) {
- status = StatusUtils.errorStatus(NLS.bind(AxisCreationUIMessages.MSG_ERROR_PROJECT_URL, new String[] {serviceProject.getName()}));
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- if (javaWSDLParam.getProjectURL() == projectURL) {
- return Status.OK_STATUS;
- }
-
- javaWSDLParam.setProjectURL(projectURL); // project URL needed for Axis deploy
-
- // modify the <soap:address> location URI to reflect the correct project URL
- if(wsdlURI!=null) {
- boolean modified = false;
- if (webServicesParser == null) {
- webServicesParser = new WebServicesParserExt();
- }
- Definition definition = webServicesParser.getWSDLDefinition(wsdlURI);
- Map services = definition.getServices();
- for (Iterator it = services.values().iterator(); it.hasNext();) {
- Service ser = (Service)it.next();
- Map ports = ser.getPorts();
- for (Iterator it2 = ports.values().iterator(); it2.hasNext();) {
- Port p = (Port)it2.next();
- for (Iterator it3 = p.getExtensibilityElements().iterator(); it3.hasNext();) {
- Object obj = it3.next();
- if (obj instanceof SOAPAddress) {
- SOAPAddress soapAddress = (SOAPAddress)obj;
- String wsdlSoapAddress = soapAddress.getLocationURI();
-
- // check if the WSDL SOAP address has the right project URL, if not, update it
- if(wsdlSoapAddress!=null) {
- if (!wsdlSoapAddress.startsWith(projectURL)) {
- // e.g. "http://tempuri.org/services/ServiceName" becomes "/services/ServiceName"
- String servicesString = wsdlSoapAddress.substring(wsdlSoapAddress.indexOf(SERVICE_EXT));
- soapAddress.setLocationURI(projectURL + servicesString);
- modified = true;
- }
-
- }
- }
- }
- }
- }
-
- if (modified) {
- // update the WSDL file and refresh in workspace
- WSDLFactory wsdlFactory = new WSDLFactoryImpl();
- WSDLWriter wsdlWriter = wsdlFactory.newWSDLWriter();
- OutputStream os = environment.getURIFactory().newURI(wsdlURI.toString()).getOutputStream();
- wsdlWriter.writeWSDL(definition, os);
- os.close();
-
- URL wsdlURL = new URL (wsdlURI);
- IResource wsdlFile = ResourceUtils.findResourceAtLocation(wsdlURL.getPath(), serviceProject);
- if (wsdlFile != null) {
- wsdlFile.refreshLocal(IResource.DEPTH_ZERO, monitor);
- }
- }
- } else {
- status = StatusUtils.errorStatus(NLS.bind(AxisCreationUIMessages.MSG_ERROR_MODIFY_ENDPOINT, new String[] {wsdlURI}));
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- } catch(Exception e) {
- status = StatusUtils.errorStatus(NLS.bind(AxisCreationUIMessages.MSG_ERROR_MODIFY_ENDPOINT, new String[] {wsdlURI}));
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- return Status.OK_STATUS;
- }
-
-
- public void setServerInstanceId(String serverId) {
- this.serverInstanceId = serverId;
- }
-
- public void setServerFactoryId(String serverFactoryId) {
- this.serverFactoryId = serverFactoryId;
- }
-
- public void setServiceProject(IProject serviceProject) {
- this.serviceProject = serviceProject;
- }
-
- public void setWsdlURI(String wsdlURI) {
- this.wsdlURI = wsdlURI;
- }
-
- public void setWebServicesParser(WebServicesParser parser) {
- webServicesParser = parser;
- }
-
-
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
- {
- this.javaWSDLParam = javaWSDLParam;
- }
-
- public JavaWSDLParameter getJavaWSDLParam()
- {
- return javaWSDLParam;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/TDAxisInputCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/TDAxisInputCommand.java
deleted file mode 100644
index dded685..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/TDAxisInputCommand.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060330 128827 kathy@ca.ibm.com - Kathy Chan
- * 20061004 159356 kathy@ca.ibm.com - Kathy Chan, Get correct module root URL based on server chosen
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;
-
-
-public class TDAxisInputCommand extends AbstractDataModelOperation {
-
- private IWebService ws_;
- private String serverProject_;
-
- private String serverServer_;
- private String serviceServerTypeID_;
- private IServer serviceExistingServer_ = null;
- private String wsdlURI_;
- private WebServiceInfo webServiceInfo_;
-
- /**
- * Default CTOR
- */
- public TDAxisInputCommand() {
- }
-
- public TDAxisInputCommand(IWebService ws, String project) {
- ws_ = ws;
- serverProject_ = project;
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- serverServer_ = ws_.getWebServiceInfo().getServerInstanceId();
-
- String serverInstanceId = ws_.getWebServiceInfo().getServerInstanceId();
- String serverFactoryId = ws_.getWebServiceInfo().getServerFactoryId();
- if (serverInstanceId != null) { // server exists
- serviceExistingServer_ = ServerCore.findServer(serverInstanceId);
- if (serviceExistingServer_ != null)
- {
- serviceServerTypeID_ = serviceExistingServer_.getServerType().getId();
- }
- }
- else
- {
- serviceServerTypeID_ = serverFactoryId;
- }
-
- wsdlURI_ = ws_.getWebServiceInfo().getWsdlURL();
- webServiceInfo_ = ws_.getWebServiceInfo();
-
- return Status.OK_STATUS;
- }
-
- /**
- * @return Returns the serverProject.
- */
- public String getServerProject()
- {
- return serverProject_;
- }
-
- public String getServerServer()
- {
- return serverServer_;
- }
-
- public String getServiceServerTypeID()
- {
- return serviceServerTypeID_;
- }
-
- public String getWsdlURI() {
- return wsdlURI_;
- }
-
- public WebServiceInfo getWebServiceInfo() {
- return webServiceInfo_;
- }
-
- public IServer getServiceExistingServer()
- {
- return serviceExistingServer_;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/TDCodeGenOperation.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/TDCodeGenOperation.java
deleted file mode 100644
index 235a7e3..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/TDCodeGenOperation.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060509 125094 sengpl@ca.ibm.com - Seng Phung-Lu, Use WorkspaceModifyOperation
- * 20060515 115225 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060517 142327 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20061004 159356 kathy@ca.ibm.com - Kathy Chan, Get correct module root URL based on server chosen
- * 20100420 307152 kchong@ca.ibm.com - Keith Chong, Web Service deployment fails without web.xml
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CopyAxisJarCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.RefreshProjectCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.BackupSkelImplCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.Skeleton2WSDLCommand;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;
-
-public class TDCodeGenOperation extends AbstractDataModelOperation {
-
- // CopyAxisJarCommand
- private CopyAxisJarCommand copyAxisJarCommand = null;
-
- // BackupSkelImplCommand
- private BackupSkelImplCommand backupSkelImplCommand = null;
- private WebServicesParser webServicesParser;
- private JavaWSDLParameter javaWSDLParam;
- private WebServiceInfo webServiceInfo;
-
- // WSDL2JavaCommand
- private WSDL2JavaCommand wsdl2JavaCommand = null;
- private String wsdlURI;
- private String httpBasicAuthUsername;
- private String httpBasicAuthPassword;
-
- // Skeleton2WSDLCommand
- private Skeleton2WSDLCommand skeleton2WSDLCommand = null;
- private IProject serverProject;
- private String serviceServerTypeID;
- private IServer serviceExistingServer;
-
- // UpdateWebXMLCommand
- private UpdateWEBXMLCommand updateWebXMLCommand = null;
-
- // RefreshProjectCommand
- private RefreshProjectCommand refreshProjectCommand = null;
-
- // CreateDeploymentDescriptorCommand
- private CreateDeploymentDescriptorCommand createDDCommand = null;
-
- /**
- * This command runs the commands passed by the constructor in a WorkspaceModifyOperation.
- * The commands are listed above, with only some of their data registry parameters since some appear
- * to overlap the commands.
- * @param backupSkelImpl
- * @param wsdl2Java
- * @param skeleton2WSDL
- * @param updateWebXML
- */
- public TDCodeGenOperation() {
- copyAxisJarCommand = new CopyAxisJarCommand();
- backupSkelImplCommand = new BackupSkelImplCommand();
- wsdl2JavaCommand = new WSDL2JavaCommand();
- skeleton2WSDLCommand = new Skeleton2WSDLCommand();
- updateWebXMLCommand = new UpdateWEBXMLCommand();
- refreshProjectCommand = new RefreshProjectCommand();
- createDDCommand = new CreateDeploymentDescriptorCommand();
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) {
- IEnvironment env = getEnvironment();
- TopDownWSModifyOperation tdOperation = new TopDownWSModifyOperation(info, env);
- try {
- tdOperation.execute(monitor);
- }
- catch(CoreException ce){
- IStatus status = ce.getStatus();
- return status;
- }
- return Status.OK_STATUS;
- }
-
-
-
- private class TopDownWSModifyOperation extends WorkspaceModifyOperation {
-
- private IAdaptable info = null;
- private IEnvironment env = null;
-
- protected TopDownWSModifyOperation(IAdaptable adaptable, IEnvironment environment){
- info = adaptable;
- env = environment;
- }
-
- protected void execute(IProgressMonitor monitor) throws CoreException {
-
- IStatus status = null;
-
- // CopyAxisJarCommand
- copyAxisJarCommand.setEnvironment(env);
- copyAxisJarCommand.setProject(serverProject);
- status = copyAxisJarCommand.execute(monitor, info);
- if (status.getSeverity() == Status.ERROR){
- throw new CoreException(status);
- }
-
- // backupSkelImplCommand
- backupSkelImplCommand.setEnvironment(env);
- backupSkelImplCommand.setWebServicesParser(webServicesParser);
- backupSkelImplCommand.setJavaWSDLParam(javaWSDLParam);
- backupSkelImplCommand.setWebServiceInfo(webServiceInfo);
- status = backupSkelImplCommand.execute(monitor, info);
- if (status.getSeverity() == Status.ERROR) {
- throw new CoreException(status);
- }
-
- // wsdl2JavaCommand
- wsdl2JavaCommand.setEnvironment(env);
- wsdl2JavaCommand.setWsdlURI(wsdlURI);
- wsdl2JavaCommand.setHttpBasicAuthUsername(httpBasicAuthUsername);
- wsdl2JavaCommand.setHttpBasicAuthPassword(httpBasicAuthPassword);
- wsdl2JavaCommand.setJavaWSDLParam(javaWSDLParam);
- status = wsdl2JavaCommand.execute(monitor, info);
- if (status.getSeverity() == Status.ERROR) {
- throw new CoreException(status);
- }
- javaWSDLParam = wsdl2JavaCommand.getJavaWSDLParam();
-
- // Skeleton2WSDLCommand
- skeleton2WSDLCommand.setEnvironment(env);
- skeleton2WSDLCommand.setWebServicesParser(webServicesParser);
- skeleton2WSDLCommand.setJavaWSDLParam(javaWSDLParam);
- skeleton2WSDLCommand.setServerProject(serverProject);
- skeleton2WSDLCommand.setServiceServerTypeID(serviceServerTypeID);
- skeleton2WSDLCommand.setServiceExistingServer(serviceExistingServer);
- status = skeleton2WSDLCommand.execute(monitor, info);
- if (status.getSeverity() == Status.ERROR) {
- throw new CoreException(status);
- }
- wsdlURI = skeleton2WSDLCommand.getWsdlURI();
-
- // create the deployment descriptor if it doesn't exist
- createDDCommand.setEnvironment(env);
- createDDCommand.setServerProject(serverProject);
- status = createDDCommand.execute(monitor, info);
- if (status.getSeverity() == Status.ERROR) {
- throw new CoreException(status);
- }
-
- // UpdateWebXMLCommand
- updateWebXMLCommand.setEnvironment(env);
- updateWebXMLCommand.setServerProject(serverProject);
- status = updateWebXMLCommand.execute(monitor, info);
- if (status.getSeverity() == Status.ERROR) {
- throw new CoreException(status);
- }
-
- // RefreshProjectCommand
- refreshProjectCommand.setEnvironment(env);
- refreshProjectCommand.setProject(serverProject);
- status = refreshProjectCommand.execute(monitor, info);
- if (status.getSeverity() == Status.ERROR) {
- throw new CoreException(status);
- }
-
- }
-
- }
-
-
-
- public JavaWSDLParameter getJavaWSDLParam() {
- return javaWSDLParam;
- }
-
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
- this.javaWSDLParam = javaWSDLParam;
- }
-
- public void setWebServiceInfo(WebServiceInfo webServiceInfo) {
- this.webServiceInfo = webServiceInfo;
- }
-
- public void setWebServicesParser(WebServicesParser webServicesParser) {
- this.webServicesParser = webServicesParser;
- }
-
- /**
- * @param httpBasicAuthPassword
- * The httpBasicAuthPassword to set.
- */
- public void setHttpBasicAuthPassword(String httpBasicAuthPassword) {
- this.httpBasicAuthPassword = httpBasicAuthPassword;
- }
-
- /**
- * @param httpBasicAuthUsername
- * The httpBasicAuthUsername to set.
- */
- public void setHttpBasicAuthUsername(String httpBasicAuthUsername) {
- this.httpBasicAuthUsername = httpBasicAuthUsername;
- }
-
- public void setWsdlURI(String wsdlURI) {
- this.wsdlURI = wsdlURI;
- }
-
- public String getWsdlURI() {
- return wsdlURI;
- }
-
- /**
- * @param serverProject The serverProject to set.
- */
- public void setServerProject(IProject serverProject) {
- this.serverProject = serverProject;
- }
-
- public void setServiceServerTypeID(String id) {
- this.serviceServerTypeID = id;
- }
-
- public void setServiceExistingServer(IServer server) {
- this.serviceExistingServer = server;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/UpdateWEBXMLCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/UpdateWEBXMLCommand.java
deleted file mode 100644
index 0efea66..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/UpdateWEBXMLCommand.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060515 115225 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20070528 186056 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.ServletMapping;
-import org.eclipse.jst.j2ee.webapplication.ServletType;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.javaee.core.DisplayName;
-import org.eclipse.jst.javaee.core.JavaeeFactory;
-import org.eclipse.jst.javaee.core.UrlPatternType;
-import org.eclipse.jst.javaee.web.WebFactory;
-import org.eclipse.jst.ws.internal.axis.creation.ui.AxisCreationUIMessages;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class UpdateWEBXMLCommand extends AbstractDataModelOperation {
-
- private IProject serverProject;
-
- public UpdateWEBXMLCommand( )
- {
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
- if (serverProject != null) {
- IStatus status = null;
- status = addServlet(serverProject, getAxisServletDescriptor());
- if (status.getSeverity() == Status.ERROR) {
- environment.getStatusHandler().reportError(status);
- return status;
- }
- addServlet(serverProject, getAdmintServletDescriptor());
- if (status.getSeverity() == Status.ERROR) {
- environment.getStatusHandler().reportError(status);
- return status;
- }
- }
- return Status.OK_STATUS;
- }
-
- private ServletDescriptor getAxisServletDescriptor() {
-
- ServletDescriptor sd = new ServletDescriptor();
- sd._name = "AxisServlet"; //$NON-NLS-1$
- sd._displayName = "Apache-Axis Servlet"; //$NON-NLS-1$
- sd._className = "org.apache.axis.transport.http.AxisServlet"; //$NON-NLS-1$
- sd._mappings = new String[] { "/servlet/AxisServlet", //$NON-NLS-1$
- "*.jws", //$NON-NLS-1$
- "/services/*" }; //$NON-NLS-1$
- return sd;
- }
-
- private ServletDescriptor getAdmintServletDescriptor() {
- ServletDescriptor sd = new ServletDescriptor();
- sd._name = "AdminServlet"; //$NON-NLS-1$
- sd._displayName = "Axis Admin Servlet"; //$NON-NLS-1$
- sd._className = "org.apache.axis.transport.http.AdminServlet"; //$NON-NLS-1$
- sd._mappings = new String[] { "/servlet/AdminServlet" }; //$NON-NLS-1$
- sd._loadOnStartup = new Integer(100);
- return sd;
- }
-
- public IStatus addServlet(final IProject webProject, final ServletDescriptor servletDescriptor) {
-
- try {
-
- final IModelProvider provider = ModelProviderManager.getModelProvider(webProject);
-
- provider.modify(new Runnable() {
- public void run() {
- Object object = provider.getModelObject();
- if (object instanceof org.eclipse.jst.javaee.web.WebApp) {
- org.eclipse.jst.javaee.web.WebApp javaeeWebApp = (org.eclipse.jst.javaee.web.WebApp) object;
- addJavaeeServlet(webProject, servletDescriptor, javaeeWebApp);
- } else if (object instanceof org.eclipse.jst.j2ee.webapplication.WebApp) {
- WebApp webApp = (WebApp) object;
- addServlet(webProject, servletDescriptor, webApp);
- }
-
- }
- }
- , null);
-
- return Status.OK_STATUS;
- } catch (Exception e) {
-
- return StatusUtils.errorStatus(
- AxisCreationUIMessages.MSG_ERROR_UPDATE_WEB_XML,
- e);
- }
- }
-
- private void addServlet(IProject webProject, ServletDescriptor servletDescriptor, WebApp webapp) {
-
- List theServlets = webapp.getServlets();
- for (int i = 0; i < theServlets.size(); i++) {
- Servlet aServlet = (Servlet) theServlets.get(i);
- if (aServlet.getServletName().equals(servletDescriptor._name)) {
- return;
- }
- }
-
- WebapplicationFactory factory = WebapplicationFactory.eINSTANCE;
-
- Servlet servlet = factory.createServlet();
- ServletType servletType = factory.createServletType();
- servlet.setWebType(servletType);
- servlet.setServletName(servletDescriptor._name);
- servletType.setClassName(servletDescriptor._className);
- if(servletDescriptor._displayName != null){
- servlet.setDisplayName(servletDescriptor._displayName);
- }
- if(servletDescriptor._loadOnStartup != null){
- servlet.setLoadOnStartup(servletDescriptor._loadOnStartup);
- }
- if(servletDescriptor._params != null){
- Properties properties = servlet.getParamsAsProperties();
- properties.putAll(servletDescriptor._params);
- }
- webapp.getServlets().add(servlet);
-
- if(servletDescriptor._mappings != null){
- for(int i=0; i<servletDescriptor._mappings.length; i++){
- ServletMapping servletMapping = factory.createServletMapping();
- servletMapping.setServlet(servlet);
- servletMapping.setUrlPattern(servletDescriptor._mappings[i]);
- webapp.getServletMappings().add(servletMapping);
- }
- }
- }
-
- private void addJavaeeServlet(IProject webProject, ServletDescriptor servletDescriptor, org.eclipse.jst.javaee.web.WebApp webapp) {
-
- List theServlets = webapp.getServlets();
- for (int i = 0; i < theServlets.size(); i++) {
- org.eclipse.jst.javaee.web.Servlet aServlet = (org.eclipse.jst.javaee.web.Servlet) theServlets.get(i);
- if (aServlet.getServletName().equals(servletDescriptor._name)) {
- return;
- }
- }
-
- WebFactory factory = WebFactory.eINSTANCE;
-
- org.eclipse.jst.javaee.web.Servlet servlet = factory.createServlet();
-
- servlet.setServletName(servletDescriptor._name);
- servlet.setServletClass(servletDescriptor._className);
-
- if(servletDescriptor._displayName != null){
- DisplayName displayNameObj = JavaeeFactory.eINSTANCE.createDisplayName();
- displayNameObj.setValue(servletDescriptor._displayName);
- servlet.getDisplayNames().add(displayNameObj);
- }
- if(servletDescriptor._loadOnStartup != null){
- servlet.setLoadOnStartup(servletDescriptor._loadOnStartup);
- }
-// if(servletDescriptor._params != null){
-// Properties properties = servlet.getParamsAsProperties();
-// properties.putAll(servletDescriptor._params);
-// }
- webapp.getServlets().add(servlet);
-
- if(servletDescriptor._mappings != null){
- for(int i=0; i<servletDescriptor._mappings.length; i++){
- org.eclipse.jst.javaee.web.ServletMapping servletMapping = factory.createServletMapping();
- servletMapping.setServletName(servlet.getServletName());
- UrlPatternType url = JavaeeFactory.eINSTANCE.createUrlPatternType();
- url.setValue(servletDescriptor._mappings[i]);
- servletMapping.getUrlPatterns().add(url);
- webapp.getServletMappings().add(servletMapping);
- }
- }
-}
-
- public void setServerProject(IProject serverProject)
- {
- this.serverProject = serverProject;
- }
-
- public class ServletDescriptor {
- String _name;
- String _className;
- String _displayName;
- Map _params;
- String[] _mappings;
- Integer _loadOnStartup;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/ValidateWSIComplianceCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/ValidateWSIComplianceCommand.java
deleted file mode 100644
index ce5635f..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/ValidateWSIComplianceCommand.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060607 144978 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.AxisConsumptionCoreMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.creation.ui.AxisCreationUIMessages;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.preferences.PersistentWSIContext;
-import org.eclipse.wst.ws.internal.preferences.WSIComplianceUtils;
-
-
-public class ValidateWSIComplianceCommand extends AbstractDataModelOperation
-{
- private JavaWSDLParameter javaWSDLParam = null;
- private Vector status = null;
- private IProject serviceProject_ = null;
-
- public ValidateWSIComplianceCommand() {
- }
-
- public IStatus execute (IProgressMonitor monitor, IAdaptable adaptable)
- {
-
- IEnvironment environment = getEnvironment();
-
- if (javaWSDLParam == null) {
- IStatus simpleStatus = StatusUtils.errorStatus( AxisConsumptionCoreMessages.MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET);
- environment.getStatusHandler().reportError(simpleStatus);
- return simpleStatus;
- }
-
- status = new Vector();
-
- PersistentWSIContext wsiContext = new PersistentWSIContext();
- int severity = WSIComplianceUtils.getWSISeverity(serviceProject_, wsiContext);
- checkRPCEncoded(severity);
- Status[] statuses = (Status[]) status.toArray(new Status[status.size()]);
-
- if (statuses.length == 0 ||
- WSIComplianceUtils.checkWSICompliance (environment.getStatusHandler(), statuses, serviceProject_, wsiContext))
- return Status.OK_STATUS;
- else {
- return StatusUtils.errorStatus("");
- }
- }
-
- private void checkRPCEncoded(int severity)
- {
- if (JavaWSDLParameter.STYLE_RPC.equals(javaWSDLParam.getStyle()) &&
- JavaWSDLParameter.USE_ENCODED.equals(javaWSDLParam.getUse()))
- status.add (new Status(severity, "ValidateWSIComplianceCommand", 0,
- AxisCreationUIMessages.WSI_INCOMPLIANCE_RPC_ENCODED, null));
-
- }
-
- /**
- * Returns the message string identified by the given key from
- * plugin.properties.
- * @return The String message.
- */
-
-/**
- * @param javaWSDLParam The javaWSDLParam to set.
- * @todo Generated comment
- */
-public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
- this.javaWSDLParam = javaWSDLParam;
-}
-
-/**
- * @param serviceProject_ The serviceProject_ to set.
- * @todo Generated comment
- */
-public void setServiceProject(IProject serviceProject_) {
- this.serviceProject_ = serviceProject_;
-}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/plugin/WebServiceAxisCreationUIPlugin.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/plugin/WebServiceAxisCreationUIPlugin.java
deleted file mode 100644
index 4addd2c..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/plugin/WebServiceAxisCreationUIPlugin.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060424 115690 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.plugin;
-
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.ILog;
-import org.osgi.framework.BundleContext;
-
-/**
-* This is the plugin class for the Web Services plugin.
-* <p>
-* This plugin contains the graphic user interface to the
-* Web Services runtime found in org.eclipse.jst.ws.
-*/
-public class WebServiceAxisCreationUIPlugin extends AbstractUIPlugin
-{
-
- /**
- * The identifier of the descriptor of this plugin in plugin.xml.
- */
- public static final String ID = "org.eclipse.jst.ws.axis.creation.ui"; //$NON-NLS-1$
-
- /**
- * The reference to the singleton instance of this plugin.
- */
- private static WebServiceAxisCreationUIPlugin instance_;
- private ILog log_;
-
- /**
- * Constructs a runtime plugin object for this plugin.
- * The "plugin" element in plugin.xml should include the attribute
- * class = "org.eclipse.jst.ws.internal.ui.plugin.WebServicePlugin".
- * @param descriptor The descriptor of this plugin.
- */
- public WebServiceAxisCreationUIPlugin()
- {
- super();
- if (instance_ == null)
- {
- instance_ = this;
- }
- log_ = EnvironmentService.getEclipseLog();
-
- }
-
- // This method is needed to keep the logging from blowing up.
- public String toString()
- {
- return ID;
- }
-
- /**
- * Returns the singleton instance of this plugin. Equivalent to calling
- * (WebServiceWasCreationUIPlugin)Platform.getPlugin("org.eclipse.jst.ws.was.v5.tp.ui");
- * @return The WebServiceConsumptionUIPlugin singleton.
- */
- static public WebServiceAxisCreationUIPlugin getInstance ()
- {
- return instance_;
- }
-
- /**
- * Called once by the platform when this plugin is first loaded.
- * @throws CoreException If this plugin fails to start.
- */
- public void start( BundleContext context ) throws CoreException
- {
- log_.log(ILog.INFO, 5068, this, "start", "Starting plugin org.eclipse.jst.ws.axis.creation.ui");
-
- try
- {
- super.start( context );
- }
- catch( Exception exc )
- {
- log_.log( ILog.ERROR, 5068, this, "start", exc );
- }
-
- setPreferences();
- }
-
- /**
- * Called once by the platform when this plugin is unloaded.
- * @throws CoreException If this plugin fails to shutdown.
- */
- public void stop( BundleContext context ) throws CoreException
- {
- log_.log(ILog.INFO, 5069, this, "stop", "Shutting plugin org.eclipse.jst.ws.axis.creation.ui");
-
- try
- {
- super.stop( context );
- }
- catch( Exception exc )
- {
- log_.log( ILog.ERROR, 5068, this, "start", exc );
- }
- }
-
-
- /**
- * Sets the general preferences to the values in the preferences store.
- **/
- public void setPreferences()
- {
- // setDialogsPreferences();
- }
-
- /**
- * @see AbstractUIPlugin#initializeDefaultPreferences
- */
- protected void initializeDefaultPreferences(IPreferenceStore preferenceStore) {
-
- // Set the defaults Preference
-// ActionDialogsPreferenceHelper.initializeDefaults(preferenceStore);
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/BUConfigCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/BUConfigCommand.java
deleted file mode 100644
index 108ef40..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/BUConfigCommand.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060424 120137 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class BUConfigCommand extends AbstractDataModelOperation {
- public BUConfigCommand() {
- }
-
- /*
- * The execute method of this command do nothing. It is merely an anchor point for UI page
- */
- public IStatus execute(IProgressMonitor monitor, IAdaptable adaptable) {
- return Status.OK_STATUS;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/BackupSkelImplCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/BackupSkelImplCommand.java
deleted file mode 100644
index e706321..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/BackupSkelImplCommand.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060330 128827 kathy@ca.ibm.com - Kathy Chan
- * 20060403 128827 kathy@ca.ibm.com - Kathy Chan
- * 20060524 127343 mahutch@ca.ibm.com - Mark Hutchinson
- * 20070116 169138 mahutch@ca.ibm.com - Mark Hutchinson
- * 20070815 188999 pmoogk@ca.ibm.com - Peter Moogk
- * 20071113 209075 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Map;
-
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.AxisConsumptionCoreMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.PlatformUtils;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.WSDLUtils;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;
-
-public class BackupSkelImplCommand extends AbstractDataModelOperation
-{
- private final String IMPL = "Impl"; //$NON-NLS-1$
- private final String DOT = "."; //$NON-NLS-1$
- private final String JAVA = "java"; //$NON-NLS-1$
- private WebServicesParser webServicesParser;
- private JavaWSDLParameter javaWSDLParam;
-
- private WebServiceInfo webServiceInfo;
-
- public BackupSkelImplCommand( ) {
- }
-
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
- if (javaWSDLParam == null)
- {
- IStatus status = StatusUtils.errorStatus(AxisConsumptionCoreMessages.MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET);
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- IStatus status = Status.OK_STATUS;
- // Read WSDL
- Definition definition = null;
- String wsdlURL = javaWSDLParam.getInputWsdlLocation();
- try
- {
- URL url = new URL(wsdlURL);
- definition = webServicesParser.getWSDLDefinition(url.toString());
- }
- catch(MalformedURLException e)
- {
- wsdlURL = PlatformUtils.getFileURLFromPath(new Path(wsdlURL));
- definition = webServicesParser.getWSDLDefinition(wsdlURL);
- }
-
- // Compute the qualified name of the Java bean skeleton
- Service service = null;
- Port port = null;
- ArrayList implURLList = new ArrayList();
- if (definition != null) {
- StringBuffer beanName = new StringBuffer();
-
- //first check if there is a mapping for this namespace to a package name
- //if not then compute package name from namespace
- String beanPackageName = null;
- Map mappings = javaWSDLParam.getMappings();
- if (mappings != null)
- {
- String targetNamespace = definition.getTargetNamespace();
- beanPackageName = (String)mappings.get(targetNamespace);
- }
- if (beanPackageName == null)
- {
- beanPackageName = WSDLUtils.getPackageName(definition);
- }
-
- javaWSDLParam.setBeanPackage(beanPackageName);
- beanName.append(beanPackageName);
- beanName.append(DOT);
-
- service = (Service) definition.getServices().values().iterator().next();
- port = (Port) service.getPorts().values().iterator().next();
- Binding binding = port.getBinding();
-
- String qName = binding.getQName().getLocalPart();
- beanName.append(qName.substring(0,1).toUpperCase());//Fix for bug 169138, need to ensure first char is uppercase
- beanName.append(qName.substring(1));
-
- beanName.append(IMPL);
- String beanNameString = beanName.toString();
- javaWSDLParam.setBeanName(beanNameString);
-
- // Defect 209075 - Do not back up anymore since skeleton merge is defaulted to on.
-
- String beanNamePathString = beanNameString.replace('.',IPath.SEPARATOR);
- IPath skelImplPath = new Path (javaWSDLParam.getJavaOutput()).append(new Path (beanNamePathString)).addFileExtension(JAVA);
-
- // store the name of the implURL
- String implURLString;
- try {
- implURLString = skelImplPath.toFile().toURL().toString();
- } catch (MalformedURLException e1) {
- implURLString = PlatformUtils.getFileURLFromPath(skelImplPath);
- }
- implURLList.add( implURLString );
-
- String[] implURLArray = new String[implURLList.size()];
- webServiceInfo.setImplURLs( (String[]) (implURLList.toArray(implURLArray)));
-
- }
- else {
- status = StatusUtils.errorStatus( NLS.bind(AxisConsumptionUIMessages.MSG_ERROR_WSDL_NO_DEFINITION, new String[] {wsdlURL}));
- environment.getStatusHandler().reportError(status);
- }
-
- return status;
- }
-
-
- /**
- * Sets the javaWSDLParam.
- * @param javaWSDLParam The javaWSDLParam to set
- */
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
- this.javaWSDLParam = javaWSDLParam;
- }
-
- /**
- * @param webServicesParser The webServicesParser to set.
- */
- public void setWebServicesParser(WebServicesParser webServicesParser) {
- this.webServicesParser = webServicesParser;
- }
-
-
-public void setWebServiceInfo(WebServiceInfo webServiceInfo) {
- this.webServiceInfo = webServiceInfo;
-}
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/DefaultsForServerJavaWSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/DefaultsForServerJavaWSDLCommand.java
deleted file mode 100644
index eb5636e..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/DefaultsForServerJavaWSDLCommand.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060330 124667 kathy@ca.ibm.com - Kathy Chan
- * 20060524 128601 andyzhai@ca.ibm.com - Andy Zhai
- * 20061004 159356 kathy@ca.ibm.com - Kathy Chan, Get correct module root URL based on server chosen
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-
-import java.io.File;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.axis.consumption.core.AxisConsumptionCoreMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.ClasspathUtils;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.FileUtil;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.PlatformUtils;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.WSDLUtils;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wsil.Utils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-public class DefaultsForServerJavaWSDLCommand extends AbstractDataModelOperation {
-
- private JavaWSDLParameter javaWSDLParam_ = null;
- private IProject serviceProject_;
- private String javaBeanName_; // this needs to be set by the extension with initial selection
- private String WSDLServiceURL_;
- private String WSDLServicePathname_;
- private WebServicesParser WSParser_;
- private String serviceServerTypeID_;
-
- private final String WSDL_FOLDER = "wsdl"; //$NON-NLS-1$
- public final String SERVICE_EXT = "/services/"; //$NON-NLS-1$
- private final String WSDL_EXT = "wsdl"; //$NON-NLS-1$
- public final byte MODE_BEAN = (byte) 0;
- public final String SERVICE_NAME_EXT = "Service"; //$NON-NLS-1$
- private final String TEMP_URI = "http://tempuri.org/"; //$NON-NLS-1$
- private IServer serviceExistingServer;
-
- public DefaultsForServerJavaWSDLCommand( )
- {
- }
-
-
- /**
- * Execute DefaultsForJavaToWSDLTask
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
-
- IStatus status;
- if (javaWSDLParam_ == null) {
- status = StatusUtils.errorStatus( AxisConsumptionCoreMessages.MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET);
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- if (javaBeanName_ == null) { // either set by extension point or bean class page
- javaBeanName_ = javaWSDLParam_.getBeanName();
- if (javaBeanName_ == null) {
- //rm javaBeanName_ = isdElement.getJavaBeanName();
- javaWSDLParam_.setBeanName(javaBeanName_);
- }
- }
- // rm WSParser_ = (WebServicesParser) wse_.getWSParser();
-
- javaWSDLParam_.setServerSide(JavaWSDLParameter.SERVER_SIDE_BEAN);
- javaWSDLParam_.setSkeletonDeploy(false);
-
- javaWSDLParam_.setBeanName(javaBeanName_);
- String classpath = ClasspathUtils.getInstance().getClasspathString(serviceProject_);
- javaWSDLParam_.setClasspath(classpath);
-
- String simpleBeanName = javaBeanName_;
- if (javaBeanName_ != null) {
- int index = javaBeanName_.lastIndexOf('.');
- if (index != -1) {
- simpleBeanName = javaBeanName_.substring(index + 1);
- }
- }
- String namespace = WSDLUtils.makeNamespace(javaWSDLParam_.getBeanName());
- javaWSDLParam_.setNamespace(namespace);
-
- javaWSDLParam_.setPortTypeName(simpleBeanName);
- javaWSDLParam_.setServiceName(simpleBeanName + SERVICE_NAME_EXT);
-
- IPath moduleServerRoot = null;
-
- IPath modulePath = serviceProject_.getFullPath();
- IPath webinfPath = serviceProject_.getFullPath();
- try {
- if (J2EEUtils.isWebComponent(serviceProject_)){
- moduleServerRoot = ResourceUtils.getJavaSourceLocation(serviceProject_);
- modulePath = J2EEUtils.getWebContentPath(serviceProject_);
- webinfPath = J2EEUtils.getWebInfPath( serviceProject_ );
- }
- } catch (Exception e) {
- status = StatusUtils.errorStatus( AxisConsumptionUIMessages.MSG_ERROR_DEFAULT_BEAN, e );
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- IPath wsdlPath =
- modulePath.append(WSDL_FOLDER).append(simpleBeanName).addFileExtension(WSDL_EXT);
-
- try{
- IFolder folder = ResourceUtils.getWorkspaceRoot().getFolder(modulePath.append(WSDL_FOLDER));
- FileUtil.createFolder(folder, true, true);
-
- }
- catch(CoreException e){
- status = StatusUtils.errorStatus( AxisConsumptionUIMessages.MSG_ERROR_WRITE_WSDL, e );
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- String wsdlLocation = ResourceUtils.getWorkspaceRoot().getFile(wsdlPath).getLocation().toString();
-
- javaWSDLParam_.setOutputWsdlLocation(wsdlLocation);
- javaWSDLParam_.setInputWsdlLocation(new File(wsdlLocation).toURI().toString());
- WSDLServicePathname_ = wsdlPath.toString();
-
- if (wsdlPath != null) {
- String wsdlURL = PlatformUtils.getFileURLFromPath(new Path(wsdlLocation));
- WSDLServiceURL_ = wsdlURL;
- // set parser
- if (wsdlURL == null || wsdlURL.length() <= 0) {
- IResource res =
- ResourceUtils.findResource(WSDLServicePathname_);
- if (res != null)
- wsdlURL = (new Utils()).toFileSystemURI(res);
- }
- if (wsdlURL != null && wsdlURL.length() > 0) {
- if (WSParser_ == null) {
- WSParser_ = new WebServicesParserExt();
- }
- }
- }
-
- javaWSDLParam_.setStyle(JavaWSDLParameter.STYLE_WRAPPED);
- javaWSDLParam_.setUse(JavaWSDLParameter.USE_LITERAL);
-
- String projectURL = null;
- if (serviceServerTypeID_ != null && serviceServerTypeID_.length()>0)
- {
- projectURL = ServerUtils.getEncodedWebComponentURL(serviceProject_, serviceServerTypeID_, serviceExistingServer);
- }
- if (projectURL == null) // either no server type defined or server not able to get project URL
- {
- projectURL = TEMP_URI + serviceProject_.getName();
- javaWSDLParam_.setGuessProjectURL(true);
- }
- javaWSDLParam_.setProjectURL(projectURL);
- String serviceURL = projectURL + SERVICE_EXT + simpleBeanName;
- javaWSDLParam_.setUrlLocation(serviceURL);
-
- javaWSDLParam_.setMetaInfOnly(true);
-
- String javaOutput = ResourceUtils.findResource(moduleServerRoot).getLocation().toString();
-
- String serviceName = javaWSDLParam_.getServiceName();
- IPath outputPath = ResourceUtils.findResource(webinfPath).getLocation();
- String output = serviceProject_.getFullPath().toString();
- if (outputPath!=null)
- output = outputPath.append(serviceName).toString();
-
- javaWSDLParam_.setJavaOutput(javaOutput);
- javaWSDLParam_.setOutput(output);
-
- return Status.OK_STATUS;
- }
-
- /**
- * Returns the javaWSDLParam.
- * @return JavaWSDLParameter
- */
- public JavaWSDLParameter getJavaWSDLParam() {
- return javaWSDLParam_;
- }
-
- /**
- * Sets the javaWSDLParam.
- * @param javaWSDLParam The javaWSDLParam to set
- */
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
- this.javaWSDLParam_ = javaWSDLParam;
- }
-
- public void setServiceProject(IProject serviceProject) {
- this.serviceProject_ = serviceProject;
- }
-
- public void setJavaBeanName(String javaBeanName) {
- this.javaBeanName_ = javaBeanName;
- }
-
- public String getWSDLServiceURL() {
- return WSDLServiceURL_;
- }
-
- public String getWSDLServicePathname() {
- return WSDLServicePathname_;
- }
-
- public void setParser(WebServicesParser wsParser) {
- this.WSParser_ = wsParser;
- }
-
- public WebServicesParser getParser() {
- return WSParser_;
- }
-
- public void setObjectSelection(IStructuredSelection objectSelection)
- {
- if (objectSelection != null && !objectSelection.isEmpty())
- {
- Object object = objectSelection.getFirstElement();
- if (object instanceof String)
- setJavaBeanName((String)object);
- }
- }
-
- public void setServiceServerTypeID(String id)
- {
- serviceServerTypeID_ = id;
- }
-
- public void setServiceExistingServer(IServer existingServer) {
- serviceExistingServer = existingServer;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/Skeleton2WSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/Skeleton2WSDLCommand.java
deleted file mode 100644
index f8f6c41..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/Skeleton2WSDLCommand.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060330 124667 kathy@ca.ibm.com - Kathy Chan
- * 20061004 159356 kathy@ca.ibm.com - Kathy Chan, Get correct module root URL based on server chosen
- * 20070112 165721 makandre@ca.ibm.com - Andrew Mak, WSDL import cannot use relative import with to parent directories
- * 20070125 171071 makandre@ca.ibm.com - Andrew Mak, Create public utility method for copying WSDL files
- * 20070409 181635 makandre@ca.ibm.com - Andrew Mak, WSDLCopier utility should create target folder
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.soap.SOAPAddress;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.AxisConsumptionCoreMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.FileUtil;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.PlatformUtils;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.WSDLUtils;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.ws.internal.util.WSDLCopier;
-
-public class Skeleton2WSDLCommand extends AbstractDataModelOperation
-{
-
- private static final String SERVICE_EXT = "/services/"; //$NON-NLS-1$
- private static final String WSDL_EXT = "wsdl"; //$NON-NLS-1$
- private final String WSDL_FOLDER = "wsdl"; //$NON-NLS-1$
- private WebServicesParser webServicesParser;
- private JavaWSDLParameter javaWSDLParam;
- private IProject serverProject;
- private String serviceServerTypeID_;
- private IServer serviceExistingServer;
- private final String TEMP_URI = "http://tempuri.org/"; //$NON-NLS-1$
-
- public Skeleton2WSDLCommand( ) {
- }
-
- /**
- * Execute Skeleton2WSDLCommand
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
- if (javaWSDLParam == null)
- {
- IStatus status = StatusUtils.errorStatus(AxisConsumptionCoreMessages.MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET);
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- // Read WSDL
- Definition definition = null;
- String wsdlURL = javaWSDLParam.getInputWsdlLocation();
- try
- {
- URL url = new URL(wsdlURL);
- definition = webServicesParser.getWSDLDefinition(url.toString());
- }
- catch(MalformedURLException e)
- {
- wsdlURL = PlatformUtils.getFileURLFromPath(new Path(wsdlURL));
- definition = webServicesParser.getWSDLDefinition(wsdlURL);
- }
-
- // Compute the qualified name of the Java bean skeleton
- Service service = null;
- Port port = null;
- if (definition != null) {
-
- // beanName and beanPackageName are now set in BackupSkelImplCommand
-
- service = (Service) definition.getServices().values().iterator().next();
- port = (Port) service.getPorts().values().iterator().next();
-
- javaWSDLParam.setPortTypeName(WSDLUtils.getPortTypeName(definition));
- javaWSDLParam.setServiceName(WSDLUtils.getServiceElementName(definition));
-
- }
- else {
- IStatus status = StatusUtils.errorStatus( NLS.bind(AxisConsumptionUIMessages.MSG_ERROR_WSDL_NO_DEFINITION, new String[] {wsdlURL}));
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- // Modify WSDL endpoint
- if (port == null) {
- IStatus status = StatusUtils.errorStatus( NLS.bind(AxisConsumptionUIMessages.MSG_ERROR_WSDL_NO_PORT, new String[] {wsdlURL}));
- environment.getStatusHandler().reportError(status);
- return status;
- }
- Map services = definition.getServices();
- for (Iterator servicesIt = services.values().iterator(); servicesIt.hasNext();)
- {
- Service s = (Service)servicesIt.next();
- Map ports = s.getPorts();
- for (Iterator portsIt = ports.values().iterator(); portsIt.hasNext();)
- {
- Port p = (Port)portsIt.next();
- modifyEndpoint(p);
- }
- }
-
- // Set WSDL file name: javaWSDLParam.setOutputWsdlLocation();
- IWorkspaceRoot workspace = ResourcesPlugin.getWorkspace().getRoot();
-
- String wsdlLocation = javaWSDLParam.getOutputWsdlLocation();
- IPath wsdlPath = null;
- IFile outputFile = null;
- try {
- if(wsdlLocation != null){
- outputFile = workspace.getFileForLocation( new Path(wsdlLocation));
- }
- else{
-// wsdlPath = serverProject.getFullPath();
-//
-// if (serverProject.hasNature(IWebNatureConstants.J2EE_NATURE_ID)) {
-// J2EEWebNatureRuntime webProject =
-// (J2EEWebNatureRuntime) serverProject.getNature(
-// IWebNatureConstants.J2EE_NATURE_ID);
-// wsdlPath = J2EEUtils.getWebContentPath( serverProject, moduleName_ );
-// //wsdlPath = wsdlPath.append(webProject.getWEBINFPath());
-// }
-// else if (serverProject.hasNature(IEJBNatureConstants.NATURE_ID))
-// {
-// EJBNatureRuntime ejbProject = EJBNatureRuntime.getRuntime(serverProject);
-// wsdlPath = wsdlPath.append(ejbProject.getMetaFolder().getProjectRelativePath().addTrailingSeparator());
-// }
-// TODO: handle EJB case
- wsdlPath = J2EEUtils.getWebContentPath( serverProject );
- IPath wsdlFilePath = wsdlPath.append(WSDL_FOLDER).append(port.getName()).addFileExtension(WSDL_EXT);
- IFolder folder = ResourceUtils
- .getWorkspaceRoot()
- .getFolder(wsdlPath.append(WSDL_FOLDER));
- FileUtil.createFolder(folder, true, true);
- outputFile = workspace.getFile(wsdlFilePath);
- wsdlLocation = outputFile.getLocation().toString();
- javaWSDLParam.setOutputWsdlLocation(wsdlLocation);
-
- }
-
- String folder = outputFile.getParent().getLocation().toFile().toURL().toString();
- String filename = outputFile.getName();
-
- WSDLCopier copier = new WSDLCopier(webServicesParser);
- copier.setSourceURI(wsdlURL, definition);
- copier.setTargetFolderURI(folder);
- copier.setTargetFilename(filename);
-
- ResourceUtils.getWorkspace().run(copier, monitor);
-
- String newPath = outputFile.getParent().getLocation().append(copier.getRelativePath()).toString();
- javaWSDLParam.setOutputWsdlLocation(newPath);
- }
- catch (Exception e) {
- IStatus status = StatusUtils.errorStatus( NLS.bind(AxisConsumptionUIMessages.MSG_ERROR_WRITE_WSDL, new String[] { wsdlLocation }), e);
- environment.getStatusHandler().reportError(status);
- return status;
- }
- return Status.OK_STATUS;
- }
-
- private IStatus modifyEndpoint(Port port)
- {
- Iterator it = port.getExtensibilityElements().iterator();
- SOAPAddress soapAddress = null;
- while (it.hasNext())
- {
- Object obj = it.next();
- if (obj instanceof SOAPAddress)
- {
- soapAddress = (SOAPAddress)obj;
- break;
- }
- }
- if (soapAddress != null)
- {
-
- String projectURL = null;
- if (serviceServerTypeID_ != null && serviceServerTypeID_.length()>0)
- {
- projectURL = ServerUtils.getEncodedWebComponentURL(serverProject, serviceServerTypeID_, serviceExistingServer);
- }
-
- if (projectURL == null) // either no server type defined or server not able to get project URL
- {
- projectURL = TEMP_URI + serverProject.getName();
- javaWSDLParam.setGuessProjectURL(true);
- }
- javaWSDLParam.setProjectURL(projectURL);
- StringBuffer serviceURL = new StringBuffer(projectURL);
- serviceURL.append(SERVICE_EXT).append(port.getName());
- javaWSDLParam.setUrlLocation(serviceURL.toString());
- soapAddress.setLocationURI(serviceURL.toString());
- }
- return Status.OK_STATUS;
- }
-
- /**
- * Returns the javaWSDLParam.
- * @return JavaWSDLParameter
- */
- public JavaWSDLParameter getJavaWSDLParam() {
- return javaWSDLParam;
- }
-
- /**
- * Sets the javaWSDLParam.
- * @param javaWSDLParam The javaWSDLParam to set
- */
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
- this.javaWSDLParam = javaWSDLParam;
- }
-
- /**
- * @param serverProject The serverProject to set.
- */
- public void setServerProject(IProject serverProject) {
- this.serverProject = serverProject;
- }
-
- /**
- * @return Returns the webServicesParser.
- */
- public WebServicesParser getWebServicesParser() {
- return webServicesParser;
- }
-
- /**
- * @param webServicesParser The webServicesParser to set.
- */
- public void setWebServicesParser(WebServicesParser webServicesParser) {
- this.webServicesParser = webServicesParser;
- }
-
- public String getWsdlURI()
- {
- File file = new File(getJavaWSDLParam().getOutputWsdlLocation());
- String url = "";
- try {
- url = file.toURL().toString();
- }
- catch(MalformedURLException mue){}
- return url;
- }
-
- public void setServiceServerTypeID(String id)
- {
- serviceServerTypeID_ = id;
- }
-
-public void setServiceExistingServer(IServer existingServer) {
- serviceExistingServer = existingServer;
-}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/TDConfigCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/TDConfigCommand.java
deleted file mode 100644
index 4c412ef..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/TDConfigCommand.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060424 120137 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class TDConfigCommand extends AbstractDataModelOperation
-{
- public TDConfigCommand()
- {
- }
-
- /*
- * The execute method of this command do nothing. It is merely an anchor point for UI page
- */
- public IStatus execute(IProgressMonitor monitor, IAdaptable adaptable) {
- return Status.OK_STATUS;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/UpdateAxisWSDDFileTask.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/UpdateAxisWSDDFileTask.java
deleted file mode 100644
index f925cb1..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/UpdateAxisWSDDFileTask.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060330 124667 kathy@ca.ibm.com - Kathy Chan
- * 20060517 134104 kathy@ca.ibm.com - Kathy Chan
- * 20071030 128419 kelvinhc@ca.ibm.com - Kelvin H. Cheung
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.AxisConsumptionCoreMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.FileUtil;
-import org.eclipse.jst.ws.internal.axis.creation.ui.AxisCreationUIMessages;
-import org.eclipse.jst.ws.internal.axis.creation.ui.plugin.WebServiceAxisCreationUIPlugin;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class UpdateAxisWSDDFileTask extends AbstractDataModelOperation {
-
- private final String DEPLOY_XSL = "deploy.xsl"; //$NON-NLS-1$
- private final String DEPLOY_BAK = "deploy.wsdd.bak"; //$NON-NLS-1$
- private final String CLASSNAME_PARAM = "newClassName"; //$NON-NLS-1$
- private JavaWSDLParameter javaWSDLParam_;
- private IProject serviceProject_;
-
- public UpdateAxisWSDDFileTask()
- {
- }
-
- /**
- * Execute UpdateAxisWSDDFileTask
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
- IStatus status = Status.OK_STATUS;
- if (javaWSDLParam_ == null) {
- status = StatusUtils.errorStatus(AxisConsumptionCoreMessages.MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET);
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- IProject project = serviceProject_;
-
- String outputLocation = javaWSDLParam_.getJavaOutput();
- if (outputLocation == null) {
- return status;
- }
-
- String webContentPath = J2EEUtils.getWebContentContainer( project ).getLocation().toString();
- try {
-
- if (javaWSDLParam_.getDeploymentFiles() != null
- && javaWSDLParam_.getDeploymentFiles().length > 0) {
-
- String wsdd_deploy = javaWSDLParam_.getDeploymentFiles()[0];
- IPath deployPath = new Path(wsdd_deploy);
- String deployBackup =
- deployPath
- .removeLastSegments(1)
- .append(DEPLOY_BAK)
- .toString();
- FileUtil.createTargetFile(wsdd_deploy, deployBackup, true);
-
- TransformerFactory tFactory = TransformerFactory.newInstance();
-
- // Use the TransformerFactory to instantiate a Transformer that will work with
- // the stylesheet you specify. This method call also processes the stylesheet
- // into a compiled Templates object.
- Transformer transformer =
- tFactory.newTransformer(new StreamSource(getPluginFileAsInputStream(DEPLOY_XSL)));
- transformer.setParameter(CLASSNAME_PARAM, javaWSDLParam_.getBeanName());
-
- // Use the Transformer to apply the associated Templates object to an XML document
- // (foo.xml) and write the output to a file (foo.out).
- FileOutputStream wsddStream = new FileOutputStream( wsdd_deploy );
-
- try
- {
- transformer.transform( new StreamSource(deployBackup), new StreamResult(wsddStream) );
- }
- finally
- {
- wsddStream.close();
- }
-
-
- IResource deployFile = ResourceUtils.findResourceAtLocation(wsdd_deploy, project);
- if( deployFile != null )
- {
- deployFile.refreshLocal( IResource.DEPTH_ZERO, monitor );
- }
-
- }
-
- } catch (Exception e) {
- String[] errorMsgStrings = new String[]{project.toString(), outputLocation.toString(), webContentPath.toString()};
- status = StatusUtils.errorStatus(NLS.bind(AxisCreationUIMessages.MSG_ERROR_UPDATE_AXIS_WSDD, errorMsgStrings), e);
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- return status;
- }
-
- private InputStream getPluginFileAsInputStream(String pluginfileName) throws CoreException {
- try {
- InputStream is = WebServiceAxisCreationUIPlugin.getInstance().getBundle().getEntry(pluginfileName).openStream();
-
- return is;
- } catch (IOException e) {
- throw new CoreException(
- new org.eclipse.core.runtime.Status(
- IStatus.WARNING,
- WebServiceAxisCreationUIPlugin.ID,
- 0,
- AxisCreationUIMessages.MSG_PLUGIN_FILE_URL,
- e));
- }
- }
-
- /**
- * Sets the javaWSDLParam.
- * @param javaWSDLParam The javaWSDLParam to set
- */
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
- javaWSDLParam_ = javaWSDLParam;
- }
-
- public JavaWSDLParameter getJavaWSDLParam()
- {
- return javaWSDLParam_;
- }
-
- public void setServiceProject(IProject serviceProject)
- {
- serviceProject_ = serviceProject;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BUAxisDefaultingCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BUAxisDefaultingCommand.java
deleted file mode 100644
index 8b795a2..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BUAxisDefaultingCommand.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.creation.ui.AxisCreationUIMessages;
-import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-/**
- *
- */
-public class BUAxisDefaultingCommand extends AbstractDataModelOperation
-{
-
- //Provide
- private IServer serviceExistingServer_;
- private JavaWSDLParameter javaWSDLParam_;
- private String javaBeanName_;
- private WebServicesParser parser_;
- private boolean forceBuild_ = true;
- private Boolean IsWebProjectStartupRequested = Boolean.TRUE; // rsk revisit
- private ValidationManager validationManager_;
- private boolean customizeServiceMappings_ = false;
-
- //This is proxy and client related information
- //which can be nulled for commands dealing
- //with service creation.
- //rsk revisit
- private Boolean isProxyProject_ = Boolean.FALSE;
- private String clientRuntimeID_ = null;
- private IProject proxyProject_ = null;
- private IProject sampleProject_ = null;
- private String sampleServerTypeID_ = null;
- private IServer sampleExistingServer_ = null;
-
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
-
- //javaWSDLParam
- javaWSDLParam_ = new JavaWSDLParameter();
-
- if (javaBeanName_ == null) {
- IStatus status = StatusUtils.errorStatus(
- AxisCreationUIMessages.MSG_ERROR_CANNOT_NO_JAVA_BEAN);
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- //parser
- parser_ = new WebServicesParserExt();
-
- //validationManager
- validationManager_ = new ValidationManager();
-
- return Status.OK_STATUS;
- }
-
-
- /**
- * @return Returns the clientRuntimeID_.
- */
- public String getClientRuntimeID()
- {
- return clientRuntimeID_;
- }
- /**
- * @return Returns the forceBuild_.
- */
- public boolean getForceBuild()
- {
- return forceBuild_;
- }
- /**
- * @return Returns the isProxyProject_.
- */
- public Boolean getIsProxyProject()
- {
- return isProxyProject_;
- }
- /**
- * @return Returns the javaBeanName_.
- */
- public String getJavaBeanName()
- {
- return javaBeanName_;
- }
- /**
- * @return Returns the javaWSDLParam_.
- */
- public JavaWSDLParameter getJavaWSDLParam()
- {
- return javaWSDLParam_;
- }
- /**
- * @return Returns the parser_.
- */
- public WebServicesParser getParser()
- {
- return parser_;
- }
- /**
- * @return Returns the proxyProject_.
- */
- public IProject getProxyProject()
- {
- return proxyProject_;
- }
- /**
- * @return Returns the sampleExistingServer_.
- */
- public IServer getSampleExistingServer()
- {
- return sampleExistingServer_;
- }
- /**
- * @return Returns the sampleProject_.
- */
- public IProject getSampleProject()
- {
- return sampleProject_;
- }
- /**
- * @return Returns the sampleServerTypeID_.
- */
- public String getSampleServerTypeID()
- {
- return sampleServerTypeID_;
- }
- /**
- * @return Returns the validationManager_.
- */
- public ValidationManager getValidationManager()
- {
- return validationManager_;
- }
-
- /**
- * @return Returns the serviceExistingServer_.
- */
- public IServer getServiceExistingServer()
- {
- return serviceExistingServer_;
- }
-
-
- public boolean getCustomizeServiceMappings()
- {
- return customizeServiceMappings_;
- }
- /**
- * @return Returns the isWebProjectStartupRequested.
- */
- public Boolean getIsWebProjectStartupRequested()
- {
- return IsWebProjectStartupRequested;
- }
-
-public void setJavaBeanName(String javaBeanName) {
- this.javaBeanName_ = javaBeanName;
-}
-
-// public void setServiceTypeRuntimeServer(TypeRuntimeServer ids)
-// {
-// serviceIds_ = ids;
-// }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanConfigWidget.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanConfigWidget.java
deleted file mode 100644
index 33ab680..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanConfigWidget.java
+++ /dev/null
@@ -1,315 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060321 128827 joan - Joan Haggarty, remove redundant wsdl URI, folder and file controls
- * 20060524 128601 andyzhai@ca.ibm.com - Andy Zhai
- * 20090302 242462 ericdp@ca.ibm.com - Eric D. Peters, Save Web services wizard settings
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean;
-
-import java.io.File;
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.creation.ui.AxisCreationUIMessages;
-import org.eclipse.jst.ws.internal.axis.creation.ui.plugin.WebServiceAxisCreationUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.ui.common.ComboWithHistory;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-
-public class BeanConfigWidget extends SimpleWidgetDataContributor
-{
-
- private Button rpcEncodedButton_;
- private Button rpcLiteralButton_;
- private Button docLiteralButton_;
-
- private Listener statusListener_;
-
- private JavaWSDLParameter javaParameter_;
-
- /* CONTEXT_ID PBCF0001 for the Bean Config Page */
- private final String INFOPOP_PBCF_PAGE = "PBCF0001"; //$NON-NLS-1$
-
- private String wsdlFolder_;
-
- private ComboWithHistory wsdlFileText_;
- /* CONTEXT_ID PBCF0007 for the WSDL File field of the Bean Config Page */
- private final String INFOPOP_PBCF_TEXT_WSDL_FILE = "PBCF0007"; //$NON-NLS-1$
-
- private Tree methodsTree_;
- /* CONTEXT_ID PBME0002 for the Methods tree of the Bean Methods Page */
- private final String INFOPOP_PBME_TREE_METHODS = "PBME0002"; //$NON-NLS-1$
-
- private Button selectAllMethodsButton_;
- /* CONTEXT_ID PBME0010 for the Select All button of the Bean Methods Page */
- private final String INFOPOP_PBME_BUTTON_SELECT_ALL = "PBME0010"; //$NON-NLS-1$
-
- private Button deselectAllMethodsButton_;
- /* CONTEXT_ID PBME0011 for the Deselect All button of the Bean Methods Page */
- private final String INFOPOP_PBME_BUTTON_DESELECT_ALL = "PBME0011"; //$NON-NLS-1$
-
- private Button showMappingsCheckbox_;
- /* CONTEXT_ID PBCF0016 for the Show Mappings checkbox of the Bean Methods Page */
- private String INFOPOP_P2N_SHOW_MAPPINGS = "PBCF0016"; //$NON-NLS-1$
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener )
- {
- String pluginId_ = "org.eclipse.jst.ws.axis.creation.ui";
-
- UIUtils uiUtils = new UIUtils( pluginId_ );
- UIUtils baseConUiUtils = new UIUtils( pluginId_ );
-
- statusListener_ = statusListener;
- parent.setToolTipText( AxisCreationUIMessages.TOOLTIP_PBCF_PAGE );
- PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId_ + "." + INFOPOP_PBCF_PAGE );
-
- Composite configGroup = uiUtils.createComposite( parent, 2 );
-
- wsdlFileText_ = uiUtils.createComboWithHistory(configGroup, AxisCreationUIMessages.LABEL_OUTPUT_FILE_NAME,
- AxisCreationUIMessages.TOOLTIP_PBCF_TEXT_WSDL_FILE,
- INFOPOP_PBCF_TEXT_WSDL_FILE,
- SWT.SINGLE | SWT.BORDER , WebServiceAxisCreationUIPlugin.getInstance().getDialogSettings());
- wsdlFileText_.addListener( SWT.Modify, statusListener );
-
- // TODO this group has no TOOLTIP or INFOPOP.
- Group methodsGroup = baseConUiUtils.createGroup( parent, ConsumptionUIMessages.LABEL_METHODS, null, null );
- methodsGroup.setLayoutData( uiUtils.createFillAll() );
-
- GridLayout layout = new GridLayout();
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- methodsGroup.setLayout( layout );
-
- methodsTree_ = uiUtils.createTree( methodsGroup, AxisCreationUIMessages.TOOLTIP_PBME_TREE_METHODS,
- INFOPOP_PBME_TREE_METHODS,
- SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL | SWT.CHECK );
- methodsTree_.addListener( SWT.Selection, statusListener );
-
- Composite selectButtons = uiUtils.createComposite( methodsGroup, 2 );
-
- selectAllMethodsButton_
- = baseConUiUtils.createPushButton( selectButtons, ConsumptionUIMessages.BUTTON_SELECT_ALL,
- ConsumptionUIMessages.TOOLTIP_PBME_BUTTON_SELECT_ALL,
- INFOPOP_PBME_BUTTON_SELECT_ALL );
- selectAllMethodsButton_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleSelectAll( true );
- }
- });
-
- deselectAllMethodsButton_
- = baseConUiUtils.createPushButton( selectButtons, ConsumptionUIMessages.BUTTON_DESELECT_ALL,
- ConsumptionUIMessages.TOOLTIP_PBME_BUTTON_DESELECT_ALL,
- INFOPOP_PBME_BUTTON_DESELECT_ALL );
- deselectAllMethodsButton_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleSelectAll( false );
- }
- });
-
- // TODO this group has no TOOLTIP or INFOPOP.
- Group styleGroup = uiUtils.createGroup( parent, AxisCreationUIMessages.LABEL_STYLE_USE, null, null );
-
- // TODO radio buttons have no TOOLTIP or INFOPOP.
- docLiteralButton_ = uiUtils.createRadioButton( styleGroup, AxisCreationUIMessages.STYLE_DOC_LITERAL, null, null );
- rpcLiteralButton_ = uiUtils.createRadioButton( styleGroup, AxisCreationUIMessages.STYLE_RPC_LITERAL, null, null );
- rpcEncodedButton_ = uiUtils.createRadioButton( styleGroup, AxisCreationUIMessages.STYLE_RPC_ENCODED, null, null );
-
- showMappingsCheckbox_ = uiUtils.createCheckbox( parent, AxisCreationUIMessages.LABEL_EXPLORE_MAPPINGS_BEAN2XML,
- AxisCreationUIMessages.TOOLTIP_P2N_SHOW_MAPPINGS,
- INFOPOP_P2N_SHOW_MAPPINGS );
-
- return this;
- }
-
- public void handleSelectAll( boolean value )
- {
- TreeItem[] items = methodsTree_.getItems();
-
- for( int i = 0; i < items.length; i++ )
- {
- items[i].setChecked(value);
- }
-
- statusListener_.handleEvent( null );
- }
-
- public void setCustomizeServiceMappings( boolean value )
- {
- showMappingsCheckbox_.setSelection( value );
- }
-
- public boolean getCustomizeServiceMappings()
- {
- return showMappingsCheckbox_ == null ? false : showMappingsCheckbox_.getSelection();
- }
-
- public void setJavaParameter( JavaWSDLParameter javaParameter )
- {
- javaParameter_ = javaParameter;
-
- String wsdlLocation = javaParameter.getOutputWsdlLocation();
- IPath wsdlPath = new Path( wsdlLocation );
-
- wsdlFolder_ = wsdlPath.removeLastSegments(1).toString();
- wsdlFileText_.setText(wsdlPath.lastSegment());
-
- methodsTree_.removeAll();
- Hashtable methods = javaParameter.getMethods();
- Enumeration e = methods.keys();
-
- while( e.hasMoreElements() )
- {
- String name = (String) e.nextElement();
- TreeItem item = new TreeItem(methodsTree_, SWT.NULL);
-
- item.setData(name);
- item.setText(name);
- item.setChecked((((Boolean) methods.get(name)).booleanValue()));
- }
-
- TreeItem[] items = methodsTree_.getItems();
-
- if( items.length > 0 )
- {
- methodsTree_.setSelection( new TreeItem[]{ items[0] } );
- }
-
- String style = javaParameter.getStyle();
-
- if( style.equals( JavaWSDLParameter.STYLE_RPC ) )
- {
- rpcEncodedButton_.setSelection(true);
- }
- else if( style.equals( JavaWSDLParameter.STYLE_DOCUMENT ) )
- {
- rpcLiteralButton_.setSelection(true);
- }
- else
- {
- docLiteralButton_.setSelection(true);
- }
- }
-
- public JavaWSDLParameter getJavaParameter()
- {
-
- IPath wsdlPath
- = new Path( wsdlFolder_.trim() ).append( wsdlFileText_.getText().trim() );
-
- // TODO Do we need to go to the eclipse file system??
- //String wsdlLocation = workspace.getFile(wsdlPath).getLocation().toString();
- String wsdlLocation = wsdlPath.toString();
-
- javaParameter_.setOutputWsdlLocation(wsdlLocation);
- javaParameter_.setInputWsdlLocation(new File(wsdlLocation).toURI().toString());
-
- Hashtable methods = new Hashtable();
-
- TreeItem[] items = methodsTree_.getItems();
-
- for( int i = 0; i < items.length; i++ )
- {
- TreeItem item = items[i];
- methods.put((String)item.getData(), new Boolean(item.getChecked()));
- }
-
- javaParameter_.setMethods(methods);
-
- if( rpcEncodedButton_.getSelection())
- {
- javaParameter_.setStyle(JavaWSDLParameter.STYLE_RPC);
- javaParameter_.setUse(JavaWSDLParameter.USE_ENCODED);
- }
- else if( rpcLiteralButton_.getSelection())
- {
- javaParameter_.setStyle(JavaWSDLParameter.STYLE_DOCUMENT);
- javaParameter_.setUse(JavaWSDLParameter.USE_LITERAL);
- }
- else
- {
- javaParameter_.setStyle(JavaWSDLParameter.STYLE_WRAPPED);
- javaParameter_.setUse(JavaWSDLParameter.USE_LITERAL);
- }
-
- return javaParameter_;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#getStatus()
- */
- public IStatus getStatus()
- {
- IStatus result = null;
-
- if( wsdlFileText_.getText().equals( "" ) )
- {
- result = StatusUtils.errorStatus( AxisCreationUIMessages.PAGE_MSG_NO_FILE_SPECIFIED );
- }
- else
- {
- TreeItem[] items = methodsTree_.getItems();
- boolean itemSelected = false;
-
- for( int index = 0; index < items.length; index++ )
- {
- if( items[index].getChecked() )
- {
- itemSelected = true;
- break;
- }
- }
-
- if( !itemSelected )
- {
- result = StatusUtils.errorStatus( AxisCreationUIMessages.PAGE_MSG_NO_METHOD_SELECTED );
- }
- }
-
- return result;
- }
-
-public void externalize() {
- super.externalize();
- wsdlFileText_.storeWidgetHistory("org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean.BeanConfigWidget.wsdlFileText_");
-}
-
-public void internalize() {
-
- wsdlFileText_.removeListener(SWT.Modify, statusListener_);
- wsdlFileText_.restoreWidgetHistory("org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean.BeanConfigWidget.wsdlFileText_");
- wsdlFileText_.addListener(SWT.Modify, statusListener_);
-}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/ValidateObjectSelectionCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/ValidateObjectSelectionCommand.java
deleted file mode 100644
index dac0747..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/ValidateObjectSelectionCommand.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.axis.creation.ui.AxisCreationUIMessages;
-import org.eclipse.jst.ws.internal.common.JavaMOFUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.common.JavaResourceFilter;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class ValidateObjectSelectionCommand extends AbstractDataModelOperation
-{
- private String JAVA_EXTENSION = ".java"; //$NON-NLS-1$
- private String CLASS_EXTENSION = ".class"; //$NON-NLS-1$
- private IStructuredSelection objectSelection;
- private String serviceProjectName;
-
-
- /**
- * Validates that the selected Java bean can be loaded from the service project. If it can't, an error is displayed.
- */
- public ValidateObjectSelectionCommand()
- {
- super();
- }
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
- //Make sure a bean is selected
- String javaBeanName = null;
- if (objectSelection != null && !objectSelection.isEmpty())
- {
- Object object = objectSelection.getFirstElement();
- if (object instanceof String)
- {
- javaBeanName = ((String)object);
- }
- else
- {
- //The ObjectSelectionWidget never appeared and so the IStucturedSelection from
- //ObjectSelectionWidgetOutputCommand is the initial selection.
- //Get the Java bean name from the selection.
- try
- {
- System.out.println(object.getClass().toString());
- javaBeanName = getJavaBeanFromObjectSelection(objectSelection);
- } catch (CoreException ce)
- {
- IStatus errorStatus = StatusUtils.errorStatus(AxisCreationUIMessages.MSG_ERROR_CANNOT_NO_JAVA_BEAN);
- environment.getStatusHandler().reportError(errorStatus);
- return errorStatus;
- }
- }
- }
-
- if (javaBeanName==null || javaBeanName.length()==0)
- {
- IStatus errorStatus = StatusUtils.errorStatus(AxisCreationUIMessages.MSG_ERROR_CANNOT_NO_JAVA_BEAN);
- environment.getStatusHandler().reportError(errorStatus);
- return errorStatus;
- }
-
- //Make sure a project is selected
- IProject serviceProject = ProjectUtilities.getProject(serviceProjectName);
- if (serviceProject==null)
- {
- IStatus errorStatus = StatusUtils.errorStatus(AxisCreationUIMessages.MSG_ERROR_NO_PROJECT);
- environment.getStatusHandler().reportError(errorStatus);
- return errorStatus;
- }
-
- //Make sure the selected bean can be loaded from the selected project
- if (javaBeanName.toLowerCase().endsWith(JAVA_EXTENSION)
- || javaBeanName.toLowerCase().endsWith(CLASS_EXTENSION)) {
- javaBeanName = javaBeanName.substring(0, javaBeanName.lastIndexOf('.'));
- }
-
- try
- {
- JavaClass javaClass = JavaMOFUtils.getJavaClass(javaBeanName, serviceProject);
- if (!javaClass.isExistingType())
- {
- IStatus errorStatus = StatusUtils.errorStatus( NLS.bind(AxisCreationUIMessages.MSG_ERROR_CANNOT_LOAD_JAVA_BEAN, new String[] { javaBeanName, serviceProjectName }));
- environment.getStatusHandler().reportError(errorStatus);
- return errorStatus;
- }
- } catch (CoreException ce)
- {
- IStatus errorStatus = StatusUtils.errorStatus( NLS.bind(AxisCreationUIMessages.MSG_ERROR_CANNOT_LOAD_JAVA_BEAN, new String[] { javaBeanName, serviceProjectName }));
- environment.getStatusHandler().reportError(errorStatus);
- return errorStatus;
- }
-
- return Status.OK_STATUS;
- }
-
- /**
- * @param serviceProjectName The serviceProjectName to set.
- */
- public void setServiceProjectName(String serviceProjectName)
- {
- this.serviceProjectName = serviceProjectName;
- }
-
- /**
- * @param objectSelection The objectSelection to set.
- */
- public void setObjectSelection(IStructuredSelection objectSelection)
- {
- this.objectSelection = objectSelection;
- }
-
- private String getJavaBeanFromObjectSelection(IStructuredSelection objectSelection) throws CoreException
- {
- String beanClass = "";
- JavaResourceFilter filter = new JavaResourceFilter();
- //IStructuredSelection selection = initialSelection_;
- //
- if (objectSelection != null)
- {
- Object obj = objectSelection.getFirstElement();
- if (obj != null)
- {
- // get the IResource represented by the selection
- IResource res = null;
-
- res = ResourceUtils.getResourceFromSelection(obj);
-
- if (filter.accepts(res))
- {
- // get the package-qualified class name without file extensions
- String beanPackage = ResourceUtils.getJavaResourcePackageName(res.getFullPath());
- if (beanPackage==null)
- beanPackage = "";
- else
- beanPackage = beanPackage + ".";
-
- beanClass = beanPackage + res.getName();
-
- if (beanClass.toLowerCase().endsWith(".java") || beanClass.toLowerCase().endsWith(".class")) {
- beanClass = beanClass.substring(0,beanClass.lastIndexOf('.'));
- }
- }
- }
- }
-
- //
- return beanClass;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/AxisSkeletonDefaultingCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/AxisSkeletonDefaultingCommand.java
deleted file mode 100644
index 47cb1e1..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/AxisSkeletonDefaultingCommand.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.consumption.common.WSDLParserFactory;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-public class AxisSkeletonDefaultingCommand extends AbstractDataModelOperation
-{
- private IStructuredSelection initialSelection;
- private WebServicesParser webServicesParser;
- private String wsdlURI_;
- private JavaWSDLParameter javaWSDLParam;
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- javaWSDLParam = new JavaWSDLParameter();
- javaWSDLParam.setServerSide(JavaWSDLParameter.SERVER_SIDE_BEAN);
- javaWSDLParam.setSkeletonDeploy(true);
- javaWSDLParam.setMetaInfOnly(false);
- javaWSDLParam.setInputWsdlLocation(wsdlURI_);
- return Status.OK_STATUS;
-
- }
-
- public void setInitialSelection(IStructuredSelection initialSelection)
- {
- this.initialSelection = initialSelection;
- }
-
- public void setObjectSelection(IStructuredSelection objectSelection)
- {
- }
-
- public void setWebServicesParser(WebServicesParser webServicesParser)
- {
- this.webServicesParser = webServicesParser;
- }
-
- public WebServicesParser getWebServicesParser()
- {
- if (webServicesParser == null)
- webServicesParser = WSDLParserFactory.getWSDLParser();
- return webServicesParser;
- }
-
- public String getWebServiceURI()
- {
- if (initialSelection != null && !initialSelection.isEmpty())
- {
- Object firstElement = initialSelection.getFirstElement();
- if (firstElement instanceof IFile)
- {
- IFile ifile = (IFile)firstElement;
- String fileExtension = ifile.getFileExtension();
- if (fileExtension.equals("wsdl") ||
- fileExtension.equals("wsil") ||
- fileExtension.equals("html"))
- {
- return ifile.getFullPath().toString();
- }
- }
- }
- return "";
- }
-
- public String getWsdlURI()
- {
- return wsdlURI_;
- }
-
- public void setWsdlURI(String wsdlURI)
- {
- wsdlURI_ = wsdlURI;
-
- }
-
- public boolean getGenWSIL()
- {
- return false;
- }
-
- public String getWsilURI()
- {
- String wsURI = getWsdlURI();
- int index = wsURI.lastIndexOf('.');
- if (index != -1)
- {
- StringBuffer sb = new StringBuffer(wsURI.substring(0, index));
- sb.append(".wsil");
- return sb.toString();
- }
- return "";
- }
-
- public JavaWSDLParameter getJavaWSDLParam()
- {
- return javaWSDLParam;
- }
-
- public String getHttpBasicAuthPassword()
- {
- return getWebServicesParser().getHTTPBasicAuthPassword();
- }
-
- public String getHttpBasicAuthUsername()
- {
- return getWebServicesParser().getHTTPBasicAuthUsername();
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidget.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidget.java
deleted file mode 100644
index 2960305..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidget.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060106 121199 jesper@selskabet.org - Jesper Møller
- * 20060321 128827 joan - Joan Haggarty, remove redundant wsdl URI, folder and file controls
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.axis.creation.ui.AxisCreationUIMessages;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-
-public class SkeletonConfigWidget extends SimpleWidgetDataContributor
-{
- private JavaWSDLParameter javaWSDLParam;
-
- /* CONTEXT_ID PBSC0001 for the Skeleton Config Page */
- private static final String INFOPOP_PBSC_PAGE = "PBSC0001"; //$NON-NLS-1$
-
- // private Text uriText_;
- /* CONTEXT_ID PBCF0002 for the URI field of the Bean Config Page */
- //private final String INFOPOP_PBCF_TEXT_URI = "PBCF0002"; //$NON-NLS-1$
-
- private Combo skeletonFolderText_;
- /* CONTEXT_ID PBSC0004 for the Skeleton Folder field of the Skeleton Config Page */
- private static final String INFOPOP_PBSC_TEXT_SKELETON_FOLDER = "PBSC0004"; //$NON-NLS-1$
-
-
- /* CONTEXT_ID PBSC0005 for the Skeleton Folder Browse button of the Skeleton Config Page */
- // private static final String INFOPOP_PBSC_BUTTON_SKELETON_FOLDER_BROWSE = "PBSC0005"; //$NON-NLS-1$
- // private static final String TOOLTIP_PBSC_BUTTON_SKELETON_FOLDER_BROWSE = "TOOLTIP_PBSC_BUTTON_SKELETON_FOLDER_BROWSE";
-
- private Button showMappingsCheckbox_;
- /* CONTEXT_ID PBSC0016 for the Show Mappings checkbox of the Bean Methods Page */
- private String INFOPOP_N2P_SHOW_MAPPINGS = "PBSC0016"; //$NON-NLS-1$
-
- private IProject serverProject_;
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener)
- {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-
- UIUtils uiUtils = new UIUtils( pluginId );
- UIUtils conUiUtils = new UIUtils( pluginId );
- UIUtils baseConUiUtils = new UIUtils( pluginId );
-
- PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId + "." + INFOPOP_PBSC_PAGE );
- parent.setToolTipText( AxisCreationUIMessages.TOOLTIP_PBSC_PAGE );
-
- Composite textGroup = uiUtils.createComposite( parent, 2, 0, 0 );
-
- /*
- uriText_ = uiUtils.createText( textGroup, "LABEL_URI",
- TOOLTIP_PBCF_TEXT_URI,
- INFOPOP_PBCF_TEXT_URI,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
- */
-
- skeletonFolderText_ = baseConUiUtils.createCombo( textGroup, ConsumptionUIMessages.LABEL_SKELETON_ROOT_NAME,
- ConsumptionUIMessages.TOOLTIP_PBSC_TEXT_SKELETON_FOLDER,
- INFOPOP_PBSC_TEXT_SKELETON_FOLDER,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-
- showMappingsCheckbox_ = conUiUtils.createCheckbox( parent, AxisConsumptionUIMessages.LABEL_EXPLORE_MAPPINGS_XML2BEAN,
- AxisConsumptionUIMessages.TOOLTIP_N2P_SHOW_MAPPINGS,
- INFOPOP_N2P_SHOW_MAPPINGS );
-
- return this;
- }
-
- public void setEndpointURI(String endpointURI)
- {
- /*
- if (endpointURI != null)
- uriText_.setText(endpointURI);
- */
- }
-
- public void setOutputJavaFolder(String outputJavaFolder)
- {
- if (outputJavaFolder != null)
- {
- int index = skeletonFolderText_.indexOf(outputJavaFolder);
- if (index != -1)
- skeletonFolderText_.select(index);
- else if (skeletonFolderText_.getItemCount() <= 0)
- {
- String root = getWorkspaceRootLocation();
- if (outputJavaFolder.startsWith(root))
- skeletonFolderText_.setText(outputJavaFolder.substring(root.length()));
- else
- skeletonFolderText_.setText(outputJavaFolder);
- }
- }
- }
-
- public void setShowMapping(boolean showMapping)
- {
- showMappingsCheckbox_.setSelection(showMapping);
- }
-
- public boolean getShowMapping()
- {
- return showMappingsCheckbox_.getSelection();
- }
-
- /**
- * @return Returns the javaWSDLParam.
- */
- public JavaWSDLParameter getJavaWSDLParam() {
-
-// Do not base Java output directory on workspace root since the project could be not
-// physically located in the workspace root, get the project specific root instead
-
- String projectSpecificRoot = serverProject_.getLocation().toString();
- String skeletonFolder = skeletonFolderText_.getText();
- String projectPathString = serverProject_.getFullPath().toString();
- if (skeletonFolder.startsWith(projectPathString)) {
- skeletonFolder = skeletonFolder.substring(projectPathString.length());
- }
- javaWSDLParam.setJavaOutput(projectSpecificRoot + skeletonFolder);
- return javaWSDLParam;
- }
-
- /**
- * @param javaWSDLParam The javaWSDLParam to set.
- */
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
- this.javaWSDLParam = javaWSDLParam;
- }
-
- public void setServerProject(IProject serviceProject)
- {
- serverProject_ = serviceProject;
- String originalSkeletonFolder = skeletonFolderText_.getText();
- skeletonFolderText_.removeAll();
- IPath[] paths = ResourceUtils.getAllJavaSourceLocations(serviceProject);
- for (int i = 0; i < paths.length ; i++)
- skeletonFolderText_.add(paths[i].toString());
- int index = skeletonFolderText_.indexOf(originalSkeletonFolder);
- if (index != -1)
- skeletonFolderText_.select(index);
- else
- skeletonFolderText_.select(0);
- }
-
- private String getWorkspaceRootLocation()
- {
- return ResourcesPlugin.getWorkspace().getRoot().getLocation().removeTrailingSeparator().toString();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidgetDefaultingCommand.java
deleted file mode 100644
index 03be88a..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060330 124667 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class SkeletonConfigWidgetDefaultingCommand extends AbstractDataModelOperation
-{
- private String wsdlURI;
- private IProject serverProject;
- private JavaWSDLParameter javaWSDLParam;
- private String serviceServerTypeID_;
-
- public SkeletonConfigWidgetDefaultingCommand( )
- {
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
-
- String outputDir = ResourceUtils.findResource(J2EEUtils.getWebInfPath( serverProject )).getLocation().toString();
- javaWSDLParam.setOutput( outputDir );
-// Do not base Java output directory on workspace root since the project could be not physically located in the workspace root
-// javaWSDLParam.setJavaOutput(getRootURL() + getOutputJavaFolder());
- String javaOutput = ResourceUtils.findResource(getOutputJavaFolder()).getLocation().toString();
- javaWSDLParam.setJavaOutput(javaOutput);
-
- return Status.OK_STATUS;
-
- }
-
- public void setWsdlURI(String wsdlURI)
- {
- this.wsdlURI = wsdlURI;
- }
-
- public void setServerProject(String serverProject)
- {
- this.serverProject = ResourcesPlugin.getWorkspace().getRoot().getProject(serverProject);
- }
-
- public String getEndpointURI()
- {
- return null;
- }
-
- public String getOutputWSDLFolder()
- {
- IPath wsdlPath = J2EEUtils.getWebContentPath(serverProject ).append("wsdl");
- return wsdlPath.toString();
- }
-
- public String getOutputWSDLFile()
- {
- int index = wsdlURI.lastIndexOf('/');
- if (index == -1)
- index = wsdlURI.lastIndexOf('\\');
- return wsdlURI.substring(index+1, wsdlURI.length());
- }
-
- public String getOutputJavaFolder()
- {
- if (serverProject!=null){
- return ResourceUtils.getJavaSourceLocation(serverProject).toString();
- }
- return null;
- }
-
- public boolean getShowMapping()
- {
- return false;
- }
-
- public boolean isShowMapping()
- {
- return getShowMapping();
- }
-
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
- {
- this.javaWSDLParam = javaWSDLParam;
- }
-
- public JavaWSDLParameter getJavaWSDLParam()
- {
- return javaWSDLParam;
- }
-
-public String getServiceServerTypeID() {
- return serviceServerTypeID_;
-}
-
-public void setServiceServerTypeID(String serviceServerTypeID) {
- this.serviceServerTypeID_ = serviceServerTypeID;
-}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/beans/WSBeanAxisType.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/beans/WSBeanAxisType.java
deleted file mode 100644
index 044bce1..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/beans/WSBeanAxisType.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060424 120137 kathy@ca.ibm.com - Kathy Chan
- * 20060523 143284 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060605 145407 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060607 144978 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans;
-
-
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisMappingsWidget;
-import org.eclipse.jst.ws.internal.axis.creation.ui.AxisCreationUIMessages;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.BUCodeGenOperation;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.JavaToWSDLMethodCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.ValidateWSIComplianceCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.DefaultsForServerJavaWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean.BeanConfigWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionWidget;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-
-
-/**
-* This is the class for the
-* Axis bottom up Java Bean scenario
-*
-*/
-public class WSBeanAxisType implements CommandWidgetBinding
-{
- private String serverName_;
- private String runtimeName_;
- private boolean isWebModuleRequired_;
-
-
- /**
- * Returns a locale specific label for the Server supported by this Web Service type
- * @return A locale specific server label from server plugins
- */
- public String getServerLabel()
- {
- return serverName_;
- }
-
- /**
- * Sets the server label to the appropriate name found in the server plugins.
- * @param server name
- */
- public void setServerLabel(String serverLabel)
- {
- serverName_ = serverLabel;
- }
-
- /**
- * Returns a locale specific label for the deployment runtime of this Web Service type
- * @return A locale specific label for the deployment runtime
- */
- public String getRuntimeLabel()
- {
- return runtimeName_;
- }
-
- /**
- * Sets the runtime label for the appropriate runtime
- * @param server name
- */
- public void setRuntimeLabel(String runtimeLabel)
- {
- runtimeName_ = runtimeLabel;
- }
-
-
- /**
- * Returns whether or not a Web Module is required for this WebServiceServerRuntimeType
- * @return true if requireWebModule
- */
- public boolean isWebModuleRequired()
- {
- return isWebModuleRequired_;
- }
-
- /**
- * Sets the boolean value at runtime according to requireWebModule attribute from the manifest file
- * @param requireWebModule
- */
- public void setWebModuleRequired(boolean requireWebModule)
- {
- isWebModuleRequired_ = requireWebModule;
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceServerRuntimeType#isEJBModuleRequired()
- */
- public boolean isEJBModuleRequired() {
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceServerRuntimeType#setEJBModuleRequired(boolean)
- */
- public void setEJBModuleRequired(boolean arg0) {
- return;
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
- */
- public void registerCanFinish(CanFinishRegistry canFinishRegistry)
- {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- /*
- dataRegistry.addMapping( CurrentPageCommand.class, "CurrentPage", BeanClassWidget.class );
- //BeanClassWidget - as target
- dataRegistry.addMapping(BUAxisDefaultingCommand.class, "JavaBeanName", BeanClassWidget.class, "BeanClassName", null);
- //BeanClassWidget - as source
- dataRegistry.addMapping(BeanClassWidget.class, "BeanClassName", DefaultsForServerJavaWSDLCommand.class, "JavaBeanName", null); //BeanConfigWidget
- */
- // ObjectSelectionWidget
- dataRegistry.addMapping(ObjectSelectionWidget.class, "ObjectSelection", DefaultsForServerJavaWSDLCommand.class);
-
- //BeanConfigWidget - as target
- dataRegistry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", BeanConfigWidget.class, "JavaParameter", null );
- //BeanConfigWidget - as source
-
- // ValidateWSIComplianceCommand
- dataRegistry.addMapping(BeanConfigWidget.class, "JavaParameter",ValidateWSIComplianceCommand.class, "JavaWSDLParam", null);
-
- //dataRegistry.addMapping(BeanConfigWidget.class, "JavaParameter", Java2WSDLCommand.class, "JavaWSDLParam", null);
- //dataRegistry.addMapping(BeanConfigWidget.class, "JavaParameter", WSDL2JavaCommand.class, "JavaWSDLParam", null);
- dataRegistry.addMapping(BeanConfigWidget.class, "JavaParameter",BUCodeGenOperation.class, "JavaWSDLParam", null);
- //AxisMappingsWidget - as target
- dataRegistry.addMapping(BeanConfigWidget.class, "JavaParameter", AxisMappingsWidget.class);
-
- //AxisMappingsWidget - as source
-
- dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", BUCodeGenOperation.class, "JavaWSDLParam", null);
-
-
- //dataRegistry.addMapping( DefaultsForConfig.class, "JavaParameter", BeanConfigWidget.class );
- //dataRegistry.addMapping( DefaultsForConfig.class, "CustomizeServiceMappings", BeanConfigWidget.class );
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
- */
- public void registerWidgetMappings(WidgetRegistry widgetRegistry)
- {
-
- /*
- widgetRegistry.add( "BeanSelection",
- AxisCreationUIMessages.PAGE_TITLE_WSBEAN_CLASS,
- AxisCreationUIMessages.PAGE_DESC_WSBEAN_CLASS,
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new BeanClassWidget();
- }
- } );
- */
-
- widgetRegistry.add( "BeanConfig",
- AxisCreationUIMessages.PAGE_TITLE_WSBEAN_CONFIG,
- AxisCreationUIMessages.PAGE_DESC_WSBEAN_CONFIG,
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new BeanConfigWidget();
- }
- } );
-
-
- widgetRegistry.add( "AxisServiceBeanMapping",
- AxisConsumptionUIMessages.PAGE_TITLE_WS_BEAN2XML,
- AxisConsumptionUIMessages.PAGE_DESC_P2N_MAPPINGS,
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new AxisMappingsWidget(AxisMappingsWidget.MODE_BEAN2XML );
- }
- } );
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactoryFactory#create()
- */
- public CommandFragmentFactory create()
- {
- return new CommandFragmentFactory()
- {
- public CommandFragment create()
- {
- //dead code - doesn't matter what gets returned here.
- return new SimpleFragment();
- }
- };
- }
-
-}
-
-
-
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/wsdl/WSWSDLAxisType.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/wsdl/WSWSDLAxisType.java
deleted file mode 100644
index 413db86..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/wsdl/WSWSDLAxisType.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060321 128827 joan - Joan Haggarty, remove redundant wsdl URI, folder and file controls
- * 20060523 143284 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060605 145407 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl;
-
-
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisMappingsFragment;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisMappingsWidget;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.TDCodeGenOperation;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.AxisSkeletonDefaultingCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.SkeletonConfigWidget;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.SkeletonConfigWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.command.data.ProjectName2IProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-
-/**
-* This is the class for the Axis Web service type.
-*/
-public class WSWSDLAxisType implements CommandWidgetBinding
-{
- private String serverName_;
- private String runtimeName_;
- private boolean isWebModuleRequired_;
-
- /**
- * Returns a locale specific label for the Server supported by this Web Service type
- * @return A locale specific server label from server plugins
- */
- public String getServerLabel() {
- return serverName_;
- }
-
- /**
- * Sets the server label to the appropriate name found in the server plugins.
- * @param server name
- */
- public void setServerLabel(String serverLabel) {
- serverName_ = serverLabel;
- }
-
- /**
- * Returns a locale specific label for the deployment runtime of this Web Service type
- * @return A locale specific label for the deployment runtime
- */
- public String getRuntimeLabel() {
- return runtimeName_;
- }
-
- /**
- * Sets the runtime label for the appropriate runtime
- * @param server name
- */
- public void setRuntimeLabel(String runtimeLabel) {
- runtimeName_ = runtimeLabel;
- }
-
- /**
- * Returns whether or not a Web Module is required for this WebServiceServerRuntimeType
- * @return true if requireWebModule
- */
- public boolean isWebModuleRequired() {
- return isWebModuleRequired_;
- }
-
- /**
- * Sets the boolean value at runtime according to requireWebModule attribute from the manifest file
- * @param requireWebModule
- */
- public void setWebModuleRequired(boolean requireWebModule) {
- isWebModuleRequired_ = requireWebModule;
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceServerRuntimeType#isEJBModuleRequired()
- */
- public boolean isEJBModuleRequired() {
-
- return false;
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceServerRuntimeType#setEJBModuleRequired(boolean)
- */
- public void setEJBModuleRequired(boolean arg0) {
- return;
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
- */
- public void registerCanFinish(CanFinishRegistry canFinishRegistry)
- {
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- // SkeletonConfigWidget
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", SkeletonConfigWidget.class, "ServerProject", new ProjectName2IProjectTransformer());
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "JavaWSDLParam", SkeletonConfigWidget.class);
- dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "EndpointURI", SkeletonConfigWidget.class);
- dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "OutputJavaFolder", SkeletonConfigWidget.class);
- dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "ShowMapping", SkeletonConfigWidget.class);
-
- // BackupSkelImplCommand
- dataRegistry.addMapping(SkeletonConfigWidget.class, "JavaWSDLParam", TDCodeGenOperation.class, "JavaWSDLParam", null);
-
- // AxisMappingsFragment
- dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "ShowMapping", AxisMappingsFragment.class);
- dataRegistry.addMapping(SkeletonConfigWidget.class, "ShowMapping", AxisMappingsFragment.class);
-
- // AxisMappingsWidget
- dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "JavaWSDLParam", AxisMappingsWidget.class, "JavaParameter", null);
- dataRegistry.addMapping(SkeletonConfigWidget.class, "JavaWSDLParam", AxisMappingsWidget.class, "JavaParameter", null);
-
- // WSDL2JavaCommand
- //dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "JavaWSDLParam", WSDL2JavaCommand.class);
- //dataRegistry.addMapping(SkeletonConfigWidget.class, "JavaWSDLParam", WSDL2JavaCommand.class);
- dataRegistry.addMapping(SkeletonConfigWidget.class, "JavaWSDLParam", TDCodeGenOperation.class, "JavaWSDLParam", null);
- dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", TDCodeGenOperation.class, "JavaWSDLParam", null);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
- */
- public void registerWidgetMappings(WidgetRegistry widgetRegistry)
- {
-
- /*
- widgetRegistry.add( "WSDLSelection",
- ConsumptionUIMessages.PAGE_TITLE_WS_SELECTION,
- ConsumptionUIMessages.PAGE_DESC_WS_SELECTION,
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new WSDLSelectionWidget();
- }
- } );
-
- widgetRegistry.add( "WSDLSelectionTreeWidget",
- ConsumptionUIMessages.PAGE_TITLE_WSDL_SELECTION,
- ConsumptionUIMessages.PAGE_DESC_WSDL_SELECTION,
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new WSDLSelectionTreeWidget();
- }
- });
- */
-
- widgetRegistry.add( "SkeletonConfig",
- ConsumptionUIMessages.PAGE_TITLE_WSSKEL_CONFIG,
- ConsumptionUIMessages.PAGE_DESC_WSSKEL_CONFIG,
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new SkeletonConfigWidget();
- }
- } );
-
- widgetRegistry.add( "AxisMappingsWidget",
- ConsumptionUIMessages.PAGE_TITLE_WS_XML2BEAN,
- ConsumptionUIMessages.PAGE_DESC_N2P_MAPPINGS,
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new AxisMappingsWidget(AxisMappingsWidget.MODE_XML2BEAN);
- }
- } );
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactoryFactory#create()
- */
- public CommandFragmentFactory create()
- {
- return new CommandFragmentFactory()
- {
- public CommandFragment create()
- {
- //dead code - doesn't matter what gets returned here.
- return new SimpleFragment();
- }
- };
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisBeanConfigWidgetFactory.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisBeanConfigWidgetFactory.java
deleted file mode 100644
index 77e6b55..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisBeanConfigWidgetFactory.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.creation.ui.wsrt;
-
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean.BeanConfigWidget;
-import org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans.WSBeanAxisType;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetBindingToWidgetFactoryAdapter;
-
-public class AxisBeanConfigWidgetFactory implements INamedWidgetContributorFactory {
-
- private INamedWidgetContributor beanConfigWidget_;
- private INamedWidgetContributor mappingsWidget_;
- private BeanConfigWidget beanWidget_;
- private WidgetBindingToWidgetFactoryAdapter adapter_;
-
- public AxisBeanConfigWidgetFactory()
- {
- adapter_ = new WidgetBindingToWidgetFactoryAdapter( new WSBeanAxisType() );
-
- beanConfigWidget_ = adapter_.getWidget( "BeanConfig" );
- beanWidget_ = (BeanConfigWidget)beanConfigWidget_.getWidgetContributorFactory().create();
- mappingsWidget_ = adapter_.getWidget( "AxisServiceBeanMapping" );
- }
-
- public INamedWidgetContributor getFirstNamedWidget()
- {
- return beanConfigWidget_;
- }
-
- public INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor)
- {
- return widgetContributor == beanConfigWidget_ && beanWidget_.getCustomizeServiceMappings() ? mappingsWidget_ : null;
- }
-
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- adapter_.registerDataMappings( dataRegistry );
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisSkeletonConfigWidgetFactory.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisSkeletonConfigWidgetFactory.java
deleted file mode 100644
index 0d8b8fe..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisSkeletonConfigWidgetFactory.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.creation.ui.wsrt;
-
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.SkeletonConfigWidget;
-import org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl.WSWSDLAxisType;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetBindingToWidgetFactoryAdapter;
-
-public class AxisSkeletonConfigWidgetFactory implements INamedWidgetContributorFactory {
-
- private INamedWidgetContributor skelConfigWidget_;
- private INamedWidgetContributor mappingsWidget_;
- private SkeletonConfigWidget skelWidget_;
- private WidgetBindingToWidgetFactoryAdapter adapter_;
-
- public AxisSkeletonConfigWidgetFactory()
- {
- adapter_ = new WidgetBindingToWidgetFactoryAdapter( new WSWSDLAxisType() );
-
- skelConfigWidget_ = adapter_.getWidget( "SkeletonConfig" );
- skelWidget_ = (SkeletonConfigWidget)skelConfigWidget_.getWidgetContributorFactory().create();
- mappingsWidget_ = adapter_.getWidget( "AxisMappingsWidget" );
- }
-
- public INamedWidgetContributor getFirstNamedWidget()
- {
- return skelConfigWidget_;
- }
-
- public INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor)
- {
- return widgetContributor == skelConfigWidget_ && skelWidget_.getShowMapping() ? mappingsWidget_ : null;
- }
-
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- adapter_.registerDataMappings( dataRegistry );
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebService.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebService.java
deleted file mode 100644
index 6881735..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebService.java
+++ /dev/null
@@ -1,336 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060330 124667 kathy@ca.ibm.com - Kathy Chan
- * 20060330 128827 kathy@ca.ibm.com - Kathy Chan
- * 20060424 120137 kathy@ca.ibm.com - Kathy Chan
- * 20060509 125094 sengpl@ca.ibm.com - Seng Phung-Lu, Use WorkspaceModifyOperation
- * 20060515 115225 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060517 142327 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060524 130755 kathy@ca.ibm.com - Kathy Chan
- * 20060607 144978 kathy@ca.ibm.com - Kathy Chan
- * 20060810 135395 makandre@ca.ibm.com - Andrew Mak, Enable WTP Web service framework opening Java editor
- * 20061004 159356 kathy@ca.ibm.com - Kathy Chan, Get correct module root URL based on server chosen
- * 20080227 119964 trungha@ca.ibm.com - Trung Ha
- * 20081111 252062 mahutch@ca.ibm.com - Mark Hutchinson, Don't depend on AutoBuild to compile bean
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.creation.ui.wsrt;
-
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.AxisDeployCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.GeronimoAxisDeployCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.RefreshProjectCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.AxisCheckCompilerLevelCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.AxisOutputCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.AxisRunInputCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.BUAxisInputCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.BUCodeGenOperation;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.CopyDeploymentFileCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.JavaToWSDLMethodCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.ModifyWSDLEndpointAddressCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.TDAxisInputCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.TDCodeGenOperation;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.ValidateWSIComplianceCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.BUConfigCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.DefaultsForServerJavaWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.TDConfigCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean.BUAxisDefaultingCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.AxisSkeletonDefaultingCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.SkeletonConfigWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildBeanCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.data.ProjectName2IProjectTransformer;
-import org.eclipse.wst.command.internal.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.ws.internal.wsrt.AbstractWebService;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-public class AxisWebService extends AbstractWebService
-{
- private AxisWebServiceInfo axisWebServiceInfo_;
-
- public AxisWebService(WebServiceInfo info)
- {
- super(info);
- }
-
- public ICommandFactory assemble(IEnvironment env, IContext ctx,
- ISelection sel, String project, String earProject)
- {
- return null;
- }
-
- public ICommandFactory deploy(IEnvironment env, IContext ctx, ISelection sel,
- String project, String earProject)
- {
- return null;
- }
-
- public ICommandFactory develop(IEnvironment env, IContext ctx, ISelection sel,
- String project, String earProject)
- {
-
- Vector commands = new Vector();
- EclipseEnvironment environment = (EclipseEnvironment)env;
-
- if (ctx.getScenario().getValue() == WebServiceScenario.BOTTOMUP) {
-
- registerBUDataMappings( environment.getCommandManager().getMappingRegistry());
-
- commands.add(new BUAxisInputCommand(this, project));
- commands.add(new AxisCheckCompilerLevelCommand());
-// commands.add(new ValidateObjectSelectionCommand());
- commands.add(new BUAxisDefaultingCommand());
- commands.add(new DefaultsForServerJavaWSDLCommand());
- commands.add(new JavaToWSDLMethodCommand());
- // commands.add(new SimpleFragment( "BeanConfig" ));
- // commands.add(new SimpleFragment( "AxisServiceBeanMapping" ));
- commands.add(new BUConfigCommand());
- commands.add(new ValidateWSIComplianceCommand());
- //commands.add(new WaitForAutoBuildCommand());
- commands.add(new BuildBeanCommand());
- commands.add(new BUCodeGenOperation());
-// commands.add(new RefreshProjectCommand());
- commands.add(new BuildProjectCommand());
- commands.add(new AxisOutputCommand(this));
-
- } else if (ctx.getScenario().getValue() == WebServiceScenario.TOPDOWN) {
-
- registerTDDataMappings( environment.getCommandManager().getMappingRegistry());
-
- commands.add(new TDAxisInputCommand(this, project));
- commands.add(new AxisSkeletonDefaultingCommand());
- commands.add(new ValidateWSDLCommand());
- commands.add(new SkeletonConfigWidgetDefaultingCommand());
-// commands.add(new SimpleFragment( "SkeletonConfig" ));
-// commands.add(new SimpleFragment( "AxisMappingsWidget" ));
- commands.add(new TDConfigCommand());
- commands.add(new TDCodeGenOperation());
-// commands.add(new RefreshProjectCommand());
- commands.add(new BuildProjectCommand());
- commands.add(new AxisOutputCommand(this));
-
- } else {
- //TODO: Remove println and reassess this "error".
- System.out.println("Error - WebServiceScenario should not be Client for AxisWebService");
- return null;
- }
-
-
- return new SimpleCommandFactory(commands);
- }
-
- public ICommandFactory install(IEnvironment env, IContext ctx, ISelection sel,
- String project, String earProject)
- {
- return null;
- }
-
- public ICommandFactory run(IEnvironment env, IContext ctx, ISelection sel,
- String project, String earProject)
- {
- Vector commands = new Vector();
-
- if (ctx.getScenario().getValue() == WebServiceScenario.CLIENT) {
- //TODO: Remove println and reassess this "error".
- System.out.println("Error - WebServiceScenario should not be Client for AxisWebService");
- return null;
- } else {// For BOTTOM_UP and TOP_DOWN
- commands.add(new AxisRunInputCommand(this, project));
- commands.add(new ModifyWSDLEndpointAddressCommand());
- commands.add(new AxisDeployCommand(project));
-
- commands.add(new RefreshProjectCommand());
-
- return new SimpleCommandFactory(commands);
- }
- }
-
- public void registerBUDataMappings(DataMappingRegistry registry)
- {
- //BUAxisInputCommand
-// registry.addMapping(BUAxisInputCommand.class, "ServiceServerTypeID", StartProjectCommand.class);
- registry.addMapping(BUAxisInputCommand.class, "JavaBeanName", BUAxisDefaultingCommand.class );
-
- //ValidateObjectSelectionCommand
-// registry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", ValidateObjectSelectionCommand.class);
-// registry.addMapping(BUAxisInputCommand.class, "ServerProject", ValidateObjectSelectionCommand.class,"ServiceProjectName", null );
-
- //BUAxisDefaultingCommand
-// registry.addMapping(SelectionCommand.class, "InitialSelection", BUAxisDefaultingCommand.class );
-//KSC registry.addMapping(BUAxisInputCommand.class, "ServiceTypeRuntimeServer", BUAxisDefaultingCommand.class );
-
- // AxisCheckCompilerLevelCommand
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", AxisCheckCompilerLevelCommand.class);
-
- //BUAxisCommands2 - these run after BeanClassWidget
- //DefaultsForServerJavaWSDLCommand
- registry.addMapping(BUAxisDefaultingCommand.class, "JavaWSDLParam", DefaultsForServerJavaWSDLCommand.class);
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", DefaultsForServerJavaWSDLCommand.class, "ServiceProject", new StringToIProjectTransformer());
- registry.addMapping(BUAxisInputCommand.class, "ServiceServerTypeID", DefaultsForServerJavaWSDLCommand.class);
- registry.addMapping(BUAxisInputCommand.class, "ServiceExistingServer", DefaultsForServerJavaWSDLCommand.class);
- registry.addMapping(BUAxisDefaultingCommand.class, "JavaBeanName", DefaultsForServerJavaWSDLCommand.class);
- registry.addMapping(BUAxisDefaultingCommand.class, "Parser", DefaultsForServerJavaWSDLCommand.class);
-
- //JavaWSDLMethodCommand
- registry.addMapping(DefaultsForServerJavaWSDLCommand.class, "JavaWSDLParam", JavaToWSDLMethodCommand.class);
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", JavaToWSDLMethodCommand.class, "ServiceProject", new StringToIProjectTransformer());
-
- // BUAxisCommands3 - these run after BeanConfigWidget
-
- //CopyAxisJarCommand
- //registry.addMapping(BUAxisInputCommand.class, "ServerProject", CopyAxisJarCommand.class, "Project", new StringToIProjectTransformer());
-
- // ValidateWSIComplianceCommand
- registry.addMapping(DefaultsForServerJavaWSDLCommand.class, "JavaWSDLParam", ValidateWSIComplianceCommand.class);
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", ValidateWSIComplianceCommand.class, "ServiceProject", new StringToIProjectTransformer());
-
- //Java2WSDLCommand
- registry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", BUCodeGenOperation.class);
-
- //RefreshProjectCommand
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", RefreshProjectCommand.class, "Project", new StringToIProjectTransformer());
-
- //UpdateWEBXMLCommand
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", BUCodeGenOperation.class, "ServiceProject", new StringToIProjectTransformer());
-
- //BuildBeanCommand
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", BuildBeanCommand.class, "Project", new StringToIProjectTransformer());
-
- //BuildProjectCommand
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", BuildProjectCommand.class, "Project", new StringToIProjectTransformer());
- registry.addMapping(BUAxisDefaultingCommand.class, "ForceBuild", BuildProjectCommand.class);
- registry.addMapping(BUAxisDefaultingCommand.class, "ValidationManager", BuildProjectCommand.class);
-
- //StartProjectCommand
-// registry.addMapping(BUAxisInputCommand.class, "ServerProject", StartProjectCommand.class, "ServiceProject", new StringToIProjectTransformer());
-// registry.addMapping(BUAxisDefaultingCommand.class, "SampleProject", StartProjectCommand.class);
-//KSC registry.addMapping(BUAxisDefaultingCommand.class, "ServiceServerTypeID", StartProjectCommand.class);
-// registry.addMapping(BUAxisDefaultingCommand.class, "SampleServerTypeID", StartProjectCommand.class);
-// registry.addMapping(BUAxisDefaultingCommand.class, "ServiceExistingServer", StartProjectCommand.class);
-// registry.addMapping(BUAxisDefaultingCommand.class, "SampleExistingServer", StartProjectCommand.class);
-// registry.addMapping(BUAxisDefaultingCommand.class, "IsWebProjectStartupRequested",StartProjectCommand.class);
-
- // AxisOutputCommand
- registry.addMapping(BUCodeGenOperation.class, "WsdlURI", AxisOutputCommand.class);
- registry.addMapping(BUCodeGenOperation.class, "JavaWSDLParam", AxisOutputCommand.class);
-
-
- // Run extension
-
-// ModifyWSDLEndpointAddressCommand
- registry.addMapping(AxisRunInputCommand.class, "JavaWSDLParam", ModifyWSDLEndpointAddressCommand.class);
- registry.addMapping(AxisRunInputCommand.class, "ServerInstanceId", ModifyWSDLEndpointAddressCommand.class);
- registry.addMapping(AxisRunInputCommand.class, "ServerFactoryId", ModifyWSDLEndpointAddressCommand.class);
- registry.addMapping(AxisRunInputCommand.class, "ServerProject", ModifyWSDLEndpointAddressCommand.class, "ServiceProject", new StringToIProjectTransformer());
- registry.addMapping(AxisRunInputCommand.class, "WsdlURI", ModifyWSDLEndpointAddressCommand.class);
- registry.addMapping(BUAxisDefaultingCommand.class, "Parser", ModifyWSDLEndpointAddressCommand.class, "WebServicesParser", null);
-
- // GeronimoAxisDeployCommand
- registry.addMapping(ModifyWSDLEndpointAddressCommand.class, "JavaWSDLParam", GeronimoAxisDeployCommand.class);
-
- //AxisDeployCommand
- registry.addMapping(ModifyWSDLEndpointAddressCommand.class, "JavaWSDLParam", AxisDeployCommand.class);
-
- // CopyDeploymentFileCommand
- registry.addMapping(AxisRunInputCommand.class, "ServerInstanceId", CopyDeploymentFileCommand.class);
-
- //RefreshProjectCommand
- registry.addMapping(AxisRunInputCommand.class, "ServerProject", RefreshProjectCommand.class, "Project", new StringToIProjectTransformer());
-
- }
-
- public void registerTDDataMappings(DataMappingRegistry dataRegistry)
- {
- // Transformers
- ProjectName2IProjectTransformer projectTransformer = new ProjectName2IProjectTransformer();
-
- // TODO: map "InitialSelection" and "ObjectSelection" from TDAxisInputCommand
-
-// dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", AxisSkeletonDefaultingCommand.class);
-// dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", AxisSkeletonDefaultingCommand.class);
-// dataRegistry.addMapping(TDAxisInputCommand.class, "WebServicesParser", AxisSkeletonDefaultingCommand.class);
-
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "JavaWSDLParam", SkeletonConfigWidgetDefaultingCommand.class);
- dataRegistry.addMapping(TDAxisInputCommand.class, "WsdlURI", AxisSkeletonDefaultingCommand.class);
- // ValidateWSDLCommand
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WebServicesParser", ValidateWSDLCommand.class);
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WsdlURI", ValidateWSDLCommand.class);
-
- // SkeletonConfigWidgetDefaultingCommand
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", SkeletonConfigWidgetDefaultingCommand.class);
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WsdlURI", SkeletonConfigWidgetDefaultingCommand.class);
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServiceServerTypeID", SkeletonConfigWidgetDefaultingCommand.class);
-
- // AxisSkeletonDefaultingCommand
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WsdlURI", TDCodeGenOperation.class);
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "HttpBasicAuthUsername", TDCodeGenOperation.class);
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "HttpBasicAuthPassword", TDCodeGenOperation.class);
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "JavaWSDLParam", TDCodeGenOperation.class);
-
- // CopyAxisJarCommand
- //dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", CopyAxisJarCommand.class, "Project", projectTransformer);
-
- // BackupSkelImplCommand
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WebServicesParser", TDCodeGenOperation.class);
- dataRegistry.addMapping(TDAxisInputCommand.class, "WebServiceInfo", TDCodeGenOperation.class);
-
- // Skeleton2WSDLCommand
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", TDCodeGenOperation.class, "ServerProject", projectTransformer);
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServiceServerTypeID", TDCodeGenOperation.class);
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServiceExistingServer", TDCodeGenOperation.class);
-
- // RefreshProjectCommand
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", RefreshProjectCommand.class, "Project", projectTransformer);
-
- // BuildProjectCommand
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", BuildProjectCommand.class, "Project", projectTransformer);
-
- // ModifyWSDLEndpointAddressCommand
- dataRegistry.addMapping(AxisRunInputCommand.class, "JavaWSDLParam", ModifyWSDLEndpointAddressCommand.class);
- dataRegistry.addMapping(AxisRunInputCommand.class, "ServerInstanceId", ModifyWSDLEndpointAddressCommand.class);
- dataRegistry.addMapping(AxisRunInputCommand.class, "ServerFactoryId", ModifyWSDLEndpointAddressCommand.class);
- dataRegistry.addMapping(AxisRunInputCommand.class, "ServerProject", ModifyWSDLEndpointAddressCommand.class, "ServiceProject", new StringToIProjectTransformer());
- dataRegistry.addMapping(AxisRunInputCommand.class, "WsdlURI", ModifyWSDLEndpointAddressCommand.class);
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WebServicesParser", ModifyWSDLEndpointAddressCommand.class);
-
- // GeronimoAxisDeployCommand
- dataRegistry.addMapping(ModifyWSDLEndpointAddressCommand.class, "JavaWSDLParam", GeronimoAxisDeployCommand.class);
-
- // AxisDeployCommand
- dataRegistry.addMapping(ModifyWSDLEndpointAddressCommand.class, "JavaWSDLParam", AxisDeployCommand.class);
-
- // CopyDeploymentFileCommand
- dataRegistry.addMapping(AxisRunInputCommand.class, "ServerInstanceId", CopyDeploymentFileCommand.class);
-
- // AxisOutputCommand
- dataRegistry.addMapping(TDCodeGenOperation.class, "WsdlURI", AxisOutputCommand.class);
- dataRegistry.addMapping(TDCodeGenOperation.class, "JavaWSDLParam", AxisOutputCommand.class);
- }
- public AxisWebServiceInfo getAxisWebServiceInfo() {
- return axisWebServiceInfo_;
- }
-
- public void setAxisWebServiceInfo(AxisWebServiceInfo axisWebServiceInfo) {
- axisWebServiceInfo_ = axisWebServiceInfo;
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceInfo.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceInfo.java
deleted file mode 100644
index 1e7f78b..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceInfo.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.creation.ui.wsrt;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-
-public class AxisWebServiceInfo {
-
- private JavaWSDLParameter javaWSDLParameter;
-
- public JavaWSDLParameter getJavaWSDLParameter() {
- return javaWSDLParameter;
- }
-
- public void setJavaWSDLParameter(JavaWSDLParameter javaWSDLParameter) {
- this.javaWSDLParameter = javaWSDLParameter;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceRuntime.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceRuntime.java
deleted file mode 100644
index bbbd10d..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceRuntime.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.creation.ui.wsrt;
-
-import org.eclipse.jst.ws.internal.axis.consumption.ui.wsrt.AxisWebServiceClient;
-import org.eclipse.wst.ws.internal.wsrt.AbstractWebServiceRuntime;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceClientInfo;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;
-
-public class AxisWebServiceRuntime extends AbstractWebServiceRuntime
-{
-
- public IWebService getWebService(WebServiceInfo info)
- {
- return new AxisWebService(info);
- }
-
- public IWebServiceClient getWebServiceClient(WebServiceClientInfo info)
- {
- return new AxisWebServiceClient(info);
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceRuntimeChecker.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceRuntimeChecker.java
deleted file mode 100644
index 041a41f..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceRuntimeChecker.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20080326 198439 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.wsrt;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.ws.internal.wsrt.AbstractWebServiceRuntimeChecker;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntimeChecker;
-
-public class AxisWebServiceRuntimeChecker extends
- AbstractWebServiceRuntimeChecker implements IWebServiceRuntimeChecker {
-
- public IStatus checkServiceClientCompatibility(boolean serviceNeedEAR,
- String serviceEARName, String serviceProjectName,
- boolean clientNeedEAR, String clientEARName,
- String clientProjectName) {
-
- if (serviceProjectName != null && serviceProjectName.equalsIgnoreCase(clientProjectName)) {
- return StatusUtils
- .errorStatus(ConsumptionUIMessages.MSG_SAME_CLIENT_AND_SERVICE_PROJECTS);
- }
- if (serviceNeedEAR && clientNeedEAR) {
- if (serviceEARName != null && serviceEARName.equals(clientEARName)) {
- return StatusUtils.warningStatus(NLS.bind(
- ConsumptionUIMessages.MSG_SAME_CLIENT_AND_SERVICE_EARS,
- new String[] { "EAR" }));
- }
- }
- return Status.OK_STATUS;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/.classpath b/bundles/org.eclipse.jst.ws.creation.ui/.classpath
deleted file mode 100644
index 196d49a..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/.cvsignore b/bundles/org.eclipse.jst.ws.creation.ui/.cvsignore
deleted file mode 100644
index 8e6edef..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-build.xml
-temp.folder
-wss-ui.jar
-@dot
-src.zip
-javaCompiler...args
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/.project b/bundles/org.eclipse.jst.ws.creation.ui/.project
deleted file mode 100644
index b9c8bfc..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.creation.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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.creation.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 8bab189..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Sat Jun 02 17:07:06 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.jst.ws.creation.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 5971ac0..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 30 10:41:04 EST 2006
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 60202c4..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,49 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.creation.ui; singleton:=true
-Bundle-Version: 1.0.511.qualifier
-Bundle-Activator: org.eclipse.jst.ws.internal.creation.ui.plugin.WebServiceCreationUIPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.creation.ui;x-internal:=true,
- org.eclipse.jst.ws.internal.creation.ui.ant;x-internal:=true,
- org.eclipse.jst.ws.internal.creation.ui.extension;x-internal:=true,
- org.eclipse.jst.ws.internal.creation.ui.plugin;x-internal:=true,
- org.eclipse.jst.ws.internal.creation.ui.preferences;x-internal:=true,
- org.eclipse.jst.ws.internal.creation.ui.server;x-internal:=true,
- org.eclipse.jst.ws.internal.creation.ui.widgets;x-internal:=true,
- org.eclipse.jst.ws.internal.creation.ui.widgets.binding;x-internal:=true,
- org.eclipse.jst.ws.internal.creation.ui.widgets.runtime;x-internal:=true,
- org.eclipse.jst.ws.internal.creation.ui.widgets.test;x-internal:=true
-Require-Bundle: org.eclipse.wst.command.env;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.wst.command.env.ui;bundle-version="[1.0.101,1.2.0)",
- org.eclipse.wst.command.env.core;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.wst.wsdl;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.wst.ws;bundle-version="[1.0.100,1.2.0)",
- org.eclipse.wst.ws.explorer;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.jst.ws;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.jst.ws.consumption;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.wst.ws.parser;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.jst.ws.ui;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.jst.ws.consumption.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.common;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.wst.server.core;bundle-version="[1.0.102,2.0.0)",
- org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.jst.j2ee.ejb;bundle-version="[1.1.0,1.2.0)",
- javax.wsdl;bundle-version="[1.5.0,1.6.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.ui.forms;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.ws.ui;bundle-version="[1.1.0,1.2.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/about.html b/bundles/org.eclipse.jst.ws.creation.ui/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/build.properties b/bundles/org.eclipse.jst.ws.creation.ui/build.properties
deleted file mode 100644
index e1dec33..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-bin.includes = .,\
- icons/,\
- plugin.properties,\
- plugin.xml,\
- META-INF/,\
- about.html
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/export_ws.gif b/bundles/org.eclipse.jst.ws.creation.ui/icons/export_ws.gif
deleted file mode 100644
index ca44ef8..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/export_ws.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/full/ctool16/new_webserv_wiz.gif b/bundles/org.eclipse.jst.ws.creation.ui/icons/full/ctool16/new_webserv_wiz.gif
deleted file mode 100644
index 2d737f0..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/full/ctool16/new_webserv_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/full/wizban/export_ws_wiz.png b/bundles/org.eclipse.jst.ws.creation.ui/icons/full/wizban/export_ws_wiz.png
deleted file mode 100644
index 3d6bcab..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/full/wizban/export_ws_wiz.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/full/wizban/webservices_wiz.png b/bundles/org.eclipse.jst.ws.creation.ui/icons/full/wizban/webservices_wiz.png
deleted file mode 100644
index 45f876a..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/full/wizban/webservices_wiz.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_assemble.jpg b/bundles/org.eclipse.jst.ws.creation.ui/icons/service_assemble.jpg
deleted file mode 100644
index 5d37933..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_assemble.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_deploy.jpg b/bundles/org.eclipse.jst.ws.creation.ui/icons/service_deploy.jpg
deleted file mode 100644
index bd58bc0..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_deploy.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_develop.jpg b/bundles/org.eclipse.jst.ws.creation.ui/icons/service_develop.jpg
deleted file mode 100644
index 38ff6a6..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_develop.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_install.jpg b/bundles/org.eclipse.jst.ws.creation.ui/icons/service_install.jpg
deleted file mode 100644
index 58fcdba..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_install.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_run.jpg b/bundles/org.eclipse.jst.ws.creation.ui/icons/service_run.jpg
deleted file mode 100644
index 5c912f7..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_run.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_test.jpg b/bundles/org.eclipse.jst.ws.creation.ui/icons/service_test.jpg
deleted file mode 100644
index ab56959..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_test.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/plugin.properties b/bundles/org.eclipse.jst.ws.creation.ui/plugin.properties
deleted file mode 100644
index 1f050d2..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/plugin.properties
+++ /dev/null
@@ -1,58 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-# yyyymmdd bug Email and other contact information
-# -------- -------- -----------------------------------------------------------
-# 20100513 311187 mahutch@ca.ibm.com - Mark Hutchinson, Capitalize context action item 'Generate Java bean skeleton'
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services Creation Graphical User Interface
-PLUGIN_PROVIDER=Eclipse Web Tools Platform
-
-PLUGIN_NEW_CATEGORY_NAME_WS=Web Services
-PLUGIN_NEW_WIZARD_NAME_WS_SERVICE=Web Service
-PLUGIN_EXPORT_WIZARD_NAME_WS=Web Service
-PLUGIN_NEW_WIZARD_DESC_WS_SERVICE=Create a new XML web service.
-PLUGIN_EXPORT_WIZARD_DESC_WS=A wizard for exporting a web service.
-
-#
-# Web Services Preferance Pages
-#
-# Dialogs
-CHECKBOX_SHOW_DEPLOY_WEB_SERVICE_DIALOG=Hide &Create Web service Dialog
-CHECKBOX_SHOW_GENERATE_SKELETON_DIALOG=Hide Generate Java Bean S&keleton Dialog
-CHECKBOX_SHOW_GENERATE_WSDL_FILES_DIALOG=Hide Generate WSDL Files Dialog
-CHECKBOX_SHOW_PUBLISH_WSDL_DIALOG=Hide Publish &WSDL Dialog
-
-PREFERENCE_CATEGORY_SCENARIO_DEFAULTS=Scenario Defaults
-
-
-#
-# Preferences Tooltips
-#
-#Action Dialogs
-TOOLTIP_PPAD_CHECKBOX_DEPLOY=Hides the dialog for deploying a Web service action
-TOOLTIP_PPAD_CHECKBOX_SKELETON=Hides the dialog for generating Java bean Skeleton action
-TOOLTIP_PPAD_CHECKBOX_WSDL=Hides the dialog for generating WSDL files action
-TOOLTIP_PPAD_CHECKBOX_PUBLISH=Hides the dialog for publishing the WSDL action
-
-#
-# Pop-up actions
-#
-ACTION_DEPLOY_WEBSERVICE=Create Web Service
-ACTION_GENERATE_JAVA_SKELETON=Generate Java Bean Skeleton
-ACTION_PUBLISH_WSDL=Publish WSDL File
-
-#
-# Wizards.
-#
-WIZARD_TITLE_WSS=Web Service
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/plugin.xml b/bundles/org.eclipse.jst.ws.creation.ui/plugin.xml
deleted file mode 100644
index 99c1b77..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/plugin.xml
+++ /dev/null
@@ -1,392 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
- <!-- Wizards -->
-
- <extension
- point="org.eclipse.ui.newWizards">
- <category
- name="%PLUGIN_NEW_CATEGORY_NAME_WS"
- id="org.eclipse.jst.ws.ui.new">
- </category>
- <wizard
- name="%PLUGIN_NEW_WIZARD_NAME_WS_SERVICE"
- icon="icons/full/ctool16/new_webserv_wiz.gif"
- category="org.eclipse.jst.ws.ui.new"
- class="org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
- <description>
- %PLUGIN_NEW_WIZARD_DESC_WS_SERVICE
- </description>
- </wizard>
- </extension>
-
- <extension
- point="org.eclipse.wst.command.env.dynamicWizard">
- <dynamicWizard
- iconbanner="icons/full/wizban/webservices_wiz.png"
- title="%WIZARD_TITLE_WSS"
- class="org.eclipse.jst.ws.internal.creation.ui.widgets.binding.ServerWidgetBinding"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
- </dynamicWizard>
- </extension>
-
- <extension
- point="org.eclipse.ui.exportWizards">
- <category
- id="org.eclipse.jst.ws.creation.ui.wsexport.category"
- name="%PLUGIN_NEW_CATEGORY_NAME_WS"/>
- </extension>
-
- <extension
- point="org.eclipse.ui.exportWizards">
- <wizard
- name="%PLUGIN_EXPORT_WIZARD_NAME_WS"
- icon="icons/export_ws.gif"
- category="org.eclipse.jst.ws.creation.ui.wsexport.category"
- class="org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard"
- id="org.eclipse.jst.ws.consumption.ui.wsexport">
- <description>
- %PLUGIN_EXPORT_WIZARD_DESC_WS
- </description>
- </wizard>
- </extension>
-
- <extension
- point="org.eclipse.wst.command.env.dynamicWizard">
- <dynamicWizard
- iconbanner="icons/full/wizban/export_ws_wiz.png"
- name="%PLUGIN_EXPORT_WIZARD_NAME_WS"
- class="org.eclipse.jst.ws.internal.creation.ui.widgets.binding.ExportWSWidgetBinding"
- id="org.eclipse.jst.ws.consumption.ui.wsexport">
- </dynamicWizard>
- </extension>
-
- <extension
- point="org.eclipse.wst.command.env.dynamicWizard">
- <dynamicWizard
- iconbanner="icons/full/wizban/export_ws_wiz.png"
- name="%PLUGIN_EXPORT_WIZARD_NAME_WS"
- class="org.eclipse.jst.ws.internal.creation.ui.widgets.binding.ExportWSWidgetBinding"
- id="org.eclipse.jst.ws.creation.ui.wizard.publish">
- </dynamicWizard>
- </extension>
-
- <!-- "Don't Show Me" Preferences -->
-
- <extension
- point="org.eclipse.wst.command.env.actionDialogPreferenceType">
-
- <actionDialogPreferenceType
- name="%CHECKBOX_SHOW_DEPLOY_WEB_SERVICE_DIALOG"
- tooltip="%TOOLTIP_PPAD_CHECKBOX_DEPLOY"
- infopop="org.eclipse.jst.ws.creation.ui.PPAD0006"
- category="org.eclipse.jst.wss.popup.category"
- objectids="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.ejb org.eclipse.jst.ws.creation.ui.wizard.serverwizard.ejb3 org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java.file org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java.compunit org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java.service.bean org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java.bean.link"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java">
- </actionDialogPreferenceType>
-
- <actionDialogPreferenceType
- name="%CHECKBOX_SHOW_GENERATE_SKELETON_DIALOG"
- tooltip="%TOOLTIP_PPAD_CHECKBOX_SKELETON"
- infopop="org.eclipse.jst.ws.creation.ui.PPAD0008"
- category="org.eclipse.jst.wss.popup.category"
- objectids="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton.file.wsdl org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton.service org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton.wsdlres org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton.serviceref org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton.file.wsil"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton">
- </actionDialogPreferenceType>
-
- <actionDialogPreferenceType
- name="%CHECKBOX_SHOW_PUBLISH_WSDL_DIALOG"
- tooltip="%TOOLTIP_PPAD_CHECKBOX_PUBLISH"
- infopop="org.eclipse.jst.ws.creation.ui.PPAD0009"
- category="org.eclipse.jst.wss.popup.category"
- objectids="org.eclipse.jst.ws.creation.ui.wizard.publish.file org.eclipse.jst.ws.creation.ui.wizard.publish.service org.eclipse.jst.ws.creation.ui.wizard.publish.wsdlres org.eclipse.jst.ws.creation.ui.wizard.publish.serviceref"
- id="org.eclipse.jst.ws.creation.ui.wizard.publish">
- </actionDialogPreferenceType>
-
- </extension>
-
- <!-- Popups -->
-
- <extension
- point="org.eclipse.ui.popupMenus">
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.java"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java.file">
- <action
- label="%ACTION_DEPLOY_WEBSERVICE"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="org.eclipse.wst.ws.ui.webservice.category.popupMenu/popupActions"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.jdt.internal.core.CompilationUnit"
- nameFilter="*.java"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java.compunit">
- <action
- label="%ACTION_DEPLOY_WEBSERVICE"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="org.eclipse.wst.ws.ui.webservice.category.popupMenu/popupActions"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.wsdl"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton.file.wsdl">
- <action
- label="%ACTION_GENERATE_JAVA_SKELETON"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="org.eclipse.wst.ws.ui.webservice.category.popupMenu/popupActions"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.wst.wsdl.Service"
- nameFilter="*"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton.service">
- <action
- label="%ACTION_GENERATE_JAVA_SKELETON"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.wst.wsdl.util.WSDLResourceImpl"
- nameFilter="*"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton.wsdlres">
- <action
- label="%ACTION_GENERATE_JAVA_SKELETON"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef"
- nameFilter="*"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton.serviceref">
- <action
- label="%ACTION_GENERATE_JAVA_SKELETON"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean"
- nameFilter="*"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java.service.bean">
- <action
- label="%ACTION_DEPLOY_WEBSERVICE"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.jst.j2ee.webservice.wsdd.BeanLink"
- nameFilter="*"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java.bean.link">
- <action
- label="%ACTION_DEPLOY_WEBSERVICE"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.wsil"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton.file.wsil">
- <action
- label="%ACTION_GENERATE_JAVA_SKELETON"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="org.eclipse.wst.ws.ui.webservice.category.popupMenu/popupActions"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.wsdl"
- id="org.eclipse.jst.ws.creation.ui.wizard.publish.file">
- <action
- label="%ACTION_PUBLISH_WSDL"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="org.eclipse.wst.ws.ui.webservice.category.popupMenu/popupActions"
- id="org.eclipse.jst.ws.creation.ui.wizard.publish">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.wst.wsdl.Service"
- nameFilter="*"
- id="org.eclipse.jst.ws.creation.ui.wizard.publish.service">
- <action
- label="%ACTION_PUBLISH_WSDL"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.creation.ui.wizard.publish">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.wst.wsdl.util.WSDLResourceImpl"
- nameFilter="*"
- id="org.eclipse.jst.ws.creation.ui.wizard.publish.wsdlres">
- <action
- label="%ACTION_PUBLISH_WSDL"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.creation.ui.wizard.publish">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef"
- nameFilter="*"
- id="org.eclipse.jst.ws.creation.ui.wizard.publish.serviceref">
- <action
- label="%ACTION_PUBLISH_WSDL"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.creation.ui.wizard.publish">
- </action>
- </objectContribution>
-
- </extension>
-
- <!-- Preference Pages -->
-
- <extension point="org.eclipse.ui.preferencePages">
- <page
- name="%PREFERENCE_CATEGORY_SCENARIO_DEFAULTS"
- category="org.eclipse.wst.ws.internal.ui.preferences.name"
- class="org.eclipse.jst.ws.internal.creation.ui.preferences.ScenarioDefaultsPreferencePage"
- id="org.eclipse.jst.ws.internal.creation.ui.preferences.ScenarioDefaultsPreferencePage">
- </page>
- </extension>
-
- <extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
- <widgetFactory
- id="StartServiceServer"
- insertBeforeCommandId="org.eclipse.jst.ws.internal.creation.ui.extension.PreServiceRunCommand"
- class="org.eclipse.jst.ws.internal.creation.ui.server.StartServerWidgetFactory"/>
- </extension>
-
- <extension point="org.eclipse.wst.command.env.antScenario">
- <antScenario
- class="org.eclipse.jst.ws.internal.creation.ui.ant.AntServiceRootCommandFragment"
- scenarioType="service"/>
- </extension>
-
- <extension
- point="org.eclipse.wst.command.env.antDataMapping">
- <map
- key="InitialSelection"
- operation="org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetDefaultingCommand"
- property="InitialSelection"
- required="true"
- transform="org.eclipse.jst.ws.internal.common.String2SelectionTransformer"/>
- <map
- key="InitialSelection"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionOutputCommand"
- property="ObjectSelection"
- required="true"
- transform="org.eclipse.jst.ws.internal.common.String2SelectionTransformer"/>
- <map
- key="Project"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionOutputCommand"
- property="Project"
- transform="org.eclipse.jst.ws.internal.common.StringToIProjectTransformer"/>
- <map
- key="ComponentName"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionOutputCommand"
- property="ComponentName"/>
- <map
- key="Service.RuntimeId"
- operation="org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetOutputCommand"
- property="ServiceTypeRuntimeServer"
- transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>
- <map
- key="Service.ServerId"
- operation="org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetOutputCommand"
- property="ServiceTypeRuntimeServer"
- transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>
- <map
- key="Service.TypeId"
- operation="org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetOutputCommand"
- property="ServiceTypeRuntimeServer"
- transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>
- <map
- key="Service.RuntimeId"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand"
- property="ServiceTypeRuntimeServer"
- transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>
- <map
- key="Service.ServerId"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand"
- property="ServiceTypeRuntimeServer"
- transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>
- <map
- key="Service.TypeId"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand"
- property="ServiceTypeRuntimeServer"
- transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>
-
- <map
- key="ServiceProjectName"
- operation="org.eclipse.jst.ws.internal.creation.ui.widgets.runtime.ServerRuntimeSelectionWidgetDefaultingCommand"
- property="ServiceProjectName"/>
-
- <map
- key="ServiceProjectName"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand"
- property="ServiceProjectName"/>
-
- <map
- key="ServiceComponentName"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand"
- property="ServiceComponentName"/>
-
- <map
- key="ServiceEarProjectName"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand"
- property="ServiceEarProjectName"/>
-
- <map
- key="ServiceEarComponentName"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand"
- property="ServiceEarComponentName"/>
- <map
- key="Service.RuntimeId"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionFragment"
- property="ServiceTypeRuntimeServer"
- transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>
- <map
- key="Service.ServerId"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionFragment"
- property="ServiceTypeRuntimeServer"
- transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>
- <map
- key="Service.TypeId"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionFragment"
- property="ServiceTypeRuntimeServer"
- transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>
- </extension>
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/CreationUI.properties b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/CreationUI.properties
deleted file mode 100644
index eb7d98c..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/CreationUI.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Wizard pages
-#
-PAGE_TITLE_OBJECT_SELECTION=Object Selection Page
-PAGE_DESC_OBJECT_SELECTION=Object Selection Page
-
-
-
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/CreationUIMessages.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/CreationUIMessages.java
deleted file mode 100644
index eb19e8b..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/CreationUIMessages.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class CreationUIMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jst.ws.internal.creation.ui.CreationUI";//$NON-NLS-1$
-
- private CreationUIMessages() {
- // Do not instantiate
- }
-
- public static String PAGE_TITLE_OBJECT_SELECTION;
- public static String PAGE_DESC_OBJECT_SELECTION;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, CreationUIMessages.class);
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/ant/AntServiceRootCommandFragment.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/ant/AntServiceRootCommandFragment.java
deleted file mode 100644
index 58aa105..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/ant/AntServiceRootCommandFragment.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060530 144358 kathy@ca.ibm.com - Kathy Chan
- * 20060530 144350 kathy@ca.ibm.com - Kathy Chan
- * 20060823 154938 pmoogk@ca.ibm.com - Peter Moogk
- * 20060825 155114 pmoogk@ca.ibm.com - Peter Moogk
- * 20061011 159283 makandre@ca.ibm.com - Andrew Mak, project not associated to EAR when using ant on command-line
- * 20070501 178129 makandre@ca.ibm.com - Andrew Mak, workspace reports "crash detected" after running WS ant task (cmdline)
- * 20080729 241275 ericdp@ca.ibm.com - Eric D. Peters, No Validation error generating Web Service client if dialog hidden
- * 20080925 242312 ericdp@ca.ibm.com - Eric D. Peters, Cannot create BUJB WS from Bean in Java project using ANT tasks
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.ant;
-
-import org.eclipse.jst.ws.internal.consumption.ui.command.AntDefaultingOperation;
-import org.eclipse.jst.ws.internal.consumption.ui.command.AntRestoringCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.AntWorkspaceSaveCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.ListOptionsCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.common.FinishFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ScenarioCleanupCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.selection.SelectionTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionOutputCommand;
-import org.eclipse.jst.ws.internal.creation.ui.extension.PreServiceDevelopCommand;
-import org.eclipse.jst.ws.internal.creation.ui.extension.ServiceRootFragment;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetOutputCommand;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.runtime.ServerRuntimeSelectionWidgetDefaultingCommand;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-
-/**
- *
- * Command fragment for generating web service top down or bottom up using Ant task.
- * Run headless Eclipse or within workspace using Run as Ant Build. This fragment eliminates any UI specific
- * commands and data mappings between commands and widgets. Widget to command mappings are
- * replaced by Ant property file to command mappings which are enabled by a antDataMapping extension
- * point in the org.eclipse.wst.command.env plugin.
- *
- * @author joan
- *
- */
-
-public class AntServiceRootCommandFragment extends SequenceFragment
-{
-
- public AntServiceRootCommandFragment()
- {
- add( new SimpleFragment( new ScenarioCleanupCommand(), "" ));
- add( new SimpleFragment(new ListOptionsCommand(), ""));
- add (new SimpleFragment(new AntDefaultingOperation(), ""));
- add( new SimpleFragment( new ServerWizardWidgetDefaultingCommand(), ""));
- add( new SimpleFragment( new ServerWizardWidgetOutputCommand(), "" ));
- add( new ObjectSelectionFragment() );
- add( new SimpleFragment( new ServerRuntimeSelectionWidgetDefaultingCommand(), ""));
- add( new SimpleFragment( new ServerExtensionDefaultingCommand(), ""));
- add( new ServiceRootFragment() );
- add( new SimpleFragment( new ServerExtensionOutputCommand(), "" ));
- add(new FinishFragment());
- add( new SimpleFragment( new AntRestoringCommand(), "" ));
- add( new SimpleFragment( new ScenarioCleanupCommand(), "" ));
- add( new SimpleFragment( new AntWorkspaceSaveCommand(), ""));
- }
-
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialSelection", null);
- dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialSelection", null);
- dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "Project", ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialProject", null);
- dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "Project", ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialProject", null);
- dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ComponentName", ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialComponentName", null);
- dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ComponentName", ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialComponentName", null);
- dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "WebServicesParser", ServerExtensionDefaultingCommand.class );
- dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "Project", ServerExtensionDefaultingCommand.class, "InitialProject", null);
-
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "GenerateProxy", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "GenerateProxy", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ResourceContext", ServerWizardWidgetOutputCommand.class);
-
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DevelopService", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "AssembleService", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DeployService", ServerWizardWidgetOutputCommand.class);
-
- // Map ServerWizardWidgetOutputCommand.
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "ServiceTypeRuntimeServer", ObjectSelectionFragment.class, "TypeRuntimeServer", null);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "ClientTypeRuntimeServer", ServerRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "ServiceTypeRuntimeServer", ServerRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "StartService", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "GenerateProxy", ServerRuntimeSelectionWidgetDefaultingCommand.class);
-
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "DevelopService", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "AssembleService", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "DeployService", ServerExtensionDefaultingCommand.class);
-
- //Map AntDefaultingFragment
- dataRegistry.addMapping(AntDefaultingOperation.class, "ServiceIdsFixed", ServerRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(AntDefaultingOperation.class, "ClientIdsFixed", ServerRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(AntDefaultingOperation.class, "StartService", PreServiceDevelopCommand.class);
- dataRegistry.addMapping(AntDefaultingOperation.class, "InstallService", PreServiceDevelopCommand.class);
- dataRegistry.addMapping(AntDefaultingOperation.class, "DeployService", PreServiceDevelopCommand.class);
-
- // Map ServerRuntimeSelectionWidgetDefaultingCommand
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceProjectName", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceEarProjectName", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentName", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceEarComponentName", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceJ2EEVersion", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceNeedEAR", ServerExtensionDefaultingCommand.class);
-
-
- // Map ServerExtensionDefaultingCommand
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerExtensionFragment.class);
- dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "Project", ServerExtensionDefaultingCommand.class, "InitialProject", null);
-
- // Setup the PreServiceDevelopCommand.
- dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "StartService", PreServiceDevelopCommand.class);
- dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "GenerateProxy", PreServiceDevelopCommand.class);
- dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "ResourceContext", PreServiceDevelopCommand.class);
-
- dataRegistry.addMapping( ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentType", PreServiceDevelopCommand.class, "ModuleType", null);
- dataRegistry.addMapping( ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentType", ServerExtensionDefaultingCommand.class );
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceRuntimeId", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialProject", PreServiceDevelopCommand.class );
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", PreServiceDevelopCommand.class );
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceRuntimeId", PreServiceDevelopCommand.class );
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceJ2EEVersion", PreServiceDevelopCommand.class);
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServerProject", PreServiceDevelopCommand.class, "Module", null );
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServerProjectEAR", PreServiceDevelopCommand.class, "Ear", null );
-
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "DevelopService", PreServiceDevelopCommand.class);
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "AssembleService", PreServiceDevelopCommand.class);
-
-
-
- dataRegistry.addMapping( ObjectSelectionOutputCommand.class, "ObjectSelection", PreServiceDevelopCommand.class, "Selection", new SelectionTransformer() );
- dataRegistry.addMapping( PreServiceDevelopCommand.class, "WebService", ServerExtensionOutputCommand.class );
-
- // Map ServerExtensionOutputCommand for ServerStart()
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProjectEAR", ServerExtensionOutputCommand.class, "EarProjectName", null);
-
- dataRegistry.addMapping(AntDefaultingOperation.class, "RendererValidation", AntRestoringCommand.class);
-
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceAssembleCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceAssembleCommand.java
deleted file mode 100644
index d77fade..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceAssembleCommand.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060131 121071 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060330 128827 kathy@ca.ibm.com - Kathy Chan
- * 20060524 141925 kathy@ca.ibm.com - Kathy Chan
- * 20060529 141422 kathy@ca.ibm.com - Kathy Chan
- * 20070509 182274 kathy@ca.ibm.com - Kathy Chan
- * 20071218 200193 gilberta@ca.ibm.com - Gilbert Andrews
- * 20071220 213640 kathy@ca.ibm.com - Kathy Chan
- * 20080325 222473 makandre@ca.ibm.com - Andrew Mak, Create EAR version based on the version of modules to be added
- * 20090415 264683 danail.branekov@sap.com - Danail Branekov
- * 20100511 309395 mahutch@ca.ibm.com - Mark Hutchinson, WS Wizard Converting Java Project into Utility Project without any warning
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.creation.ui.extension;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.operation.ModalContext;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.AssociateModuleWithEARCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateFacetedProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.common.FacetUtils;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-import org.eclipse.wst.ws.internal.preferences.PersistentMergeContext;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-import org.eclipse.wst.ws.internal.wsrt.IMerger;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-public class PreServiceAssembleCommand extends AbstractDataModelOperation
-{
- private IWebService webService_;
- private String project_;
- private String module_;
- private String earProject_;
- private String ear_;
- private IContext context_;
- private IProject initialProject_;
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
- IStatus status = Status.OK_STATUS;
-
- // For top down scenarios, merge the content of the skeleton files with the previous version stored.
- // The Web service extensions triggers the storing of the content of the old skeleton file by
- // calling WebServiceInfo.setImplURLs() before the new skeleton is generated in the extension's
- // develop() method.
-
- if (context_.getScenario().getValue() == WebServiceScenario.TOPDOWN) {
- PersistentMergeContext mergeContext = WSPlugin.getInstance().getMergeContext();
- IMerger merger = webService_.getWebServiceInfo().getMerger();
- if (mergeContext.isSkeletonMergeEnabled() && merger != null) {
- status = merger.merge(monitor, getEnvironment().getStatusHandler());
- if (status.getSeverity() == Status.ERROR) {
- environment.getStatusHandler().reportError(status);
- return status;
- }
- }
- }
-
- if (context_.getAssemble()) {
-
- // Check if EAR module is req'd, ie. !=null
- if (earProject_==null)
- return Status.OK_STATUS;
-
-
-
- //Create the service EAR module
-
- CreateFacetedProjectCommand command = new CreateFacetedProjectCommand();
- command.setProjectName(earProject_);
- command.setTemplateId(IJ2EEModuleConstants.JST_EAR_TEMPLATE);
-
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(project_);
- command.setRequiredFacetVersions(FacetUtils.getRequiredEARFacetVersions(project));
-
- command.setServerFactoryId(webService_.getWebServiceInfo().getServerFactoryId());
- command.setServerInstanceId(webService_.getWebServiceInfo().getServerInstanceId());
- status = command.execute( monitor, adaptable );
- if (status.getSeverity() == Status.ERROR)
- {
- environment.getStatusHandler().reportError( status );
- return status;
- }
-
- //Associate the service module and service EAR
- AssociateModuleWithEARCommand associateCommand = new AssociateModuleWithEARCommand();
- associateCommand.setProject(project_);
- associateCommand.setModule(module_);
- associateCommand.setEARProject(earProject_);
- associateCommand.setEar(ear_);
- associateCommand.setEnvironment( environment );
- status = associateCommand.execute( monitor, null );
- if (status.getSeverity()==Status.ERROR)
- {
- environment.getStatusHandler().reportError(status);
- }
-
- //make sure the ear file has been created.
-
- if(initialProject_ != null && FacetUtils.isJavaProject(initialProject_) && context_.getScenario().getValue() == WebServiceScenario.BOTTOMUP) {
- IProject earProject = ResourcesPlugin.getWorkspace().getRoot().getProject(earProject_);
- addJavaProjectAsUtilityInModalCtx(initialProject_, earProject, monitor);
- }
-
- }
- return status;
- }
-
- private void addJavaProjectAsUtilityInModalCtx(final IProject projectToAdd, final IProject earProject, final IProgressMonitor monitor)
- {
- final IRunnableWithProgress addRunnable = new IRunnableWithProgress()
- {
- public void run(final IProgressMonitor monitor) throws InvocationTargetException, InterruptedException
- {
- J2EEUtils.addJavaProjectAsUtilityJar(projectToAdd, earProject, monitor);
- }
- };
-
- try
- {
- ModalContext.run(addRunnable, true, monitor, PlatformUI.getWorkbench().getDisplay());
- } catch (InvocationTargetException e)
- {
- // The executed runnable does not throw checked exceptions therefore if this happens, this is a runtime exception
- throw new RuntimeException(e);
- } catch (InterruptedException e)
- {
- // The executed runnable does not support cancellation and this should never happen
- throw new IllegalStateException(e);
- }
- }
-
- public void setInitialProject(IProject initialProject)
- {
- initialProject_ = initialProject;
- }
-
- public IProject getInitialProject()
- {
- return initialProject_;
- }
-
- public void setProject( String project )
- {
- project_ = project;
- }
-
- public void setModule( String module )
- {
- module_ = module;
- }
-
- public void setEarProject( String earProject )
- {
- earProject_ = earProject;
- }
-
- public void setEar( String ear )
- {
- ear_ = ear;
- }
-
- public void setWebService( IWebService webService )
- {
- webService_ = webService;
- }
-
- public void setContext (IContext context) {
- context_ = context;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDeployCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDeployCommand.java
deleted file mode 100644
index 4e55759..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDeployCommand.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.creation.ui.extension;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-
-public class PreServiceDeployCommand extends AbstractDataModelOperation
-{
- private IContext context_;
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- if (context_.getDeploy())
- {
- //If and when there are framework specific deploy things to be done,
- //do them here.
- }
-
- return Status.OK_STATUS;
- }
-
- public void setContext(IContext context)
- {
- context_=context;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDevelopCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDevelopCommand.java
deleted file mode 100644
index aebaa67..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDevelopCommand.java
+++ /dev/null
@@ -1,411 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060131 121071 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060516 126965 kathy@ca.ibm.com - Kathy Chan
- * 20060529 141422 kathy@ca.ibm.com - Kathy Chan
- * 20070123 167487 makandre@ca.ibm.com - Andrew Mak
- * 20070403 173654 kathy@ca.ibm.com - Kathy Chan
- * 20070509 182274 kathy@ca.ibm.com - Kathy Chan
- * 20071212 200193 gilberta@ca.ibm.com - Gilbert Andrews
- * 20071220 213640 kathy@ca.ibm.com - Kathy Chan
- * 20080326 221364 kathy@ca.ibm.com - Kathy Chan
- * 20080724 241275 pmoogk@ca.ibm.com - Peter Moogk, Validate WSDL before doing major Web service processing.
- * 20081001 243869 ericdp@ca.ibm.com - Eric D. Peters, Web Service tools allowing mixed J2EE levels
- * 20090415 264683 danail.branekov@sap.com - Danail Branekov
- * 20100511 309395 mahutch@ca.ibm.com - Mark Hutchinson, WS Wizard Converting Java Project into Utility Project without any warning
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.creation.ui.extension;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.operation.ModalContext;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateFacetedProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.common.FacetUtils;
-import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion;
-import org.eclipse.jst.ws.internal.consumption.common.WSDLParserFactory;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.TimedWSDLSelectionConditionCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.ServiceRuntimeDescriptor;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.common.HTTPUtility;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServiceEntity;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.IMerger;
-import org.eclipse.wst.ws.internal.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntime;
-import org.eclipse.wst.ws.internal.wsrt.SimpleContext;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceState;
-
-public class PreServiceDevelopCommand extends AbstractDataModelOperation
-{
- private TypeRuntimeServer typeRuntimeServer_;
- private String serviceRuntimeId_;
- private IContext context_;
- private ISelection selection_;
- private String project_;
- private String module_;
- private String moduleType_;
- private String earProject_;
- private String ear_;
- private IProject initialProject_;
-
- private IWebService webService_;
- private String j2eeLevel_;
- private ResourceContext resourceContext_;
-
- private boolean develop_;
- private boolean assemble_;
- private boolean deploy_;
- private boolean install_;
- private boolean run_;
- private boolean client_;
- private boolean test_;
- private boolean publish_;
-
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IStatus status = Status.OK_STATUS;
- if (develop_) {
- IEnvironment environment = getEnvironment();
-
- // Split up the project and module
- int index = module_.indexOf("/");
- if (index!=-1){
- project_ = module_.substring(0,index);
- module_ = module_.substring(index+1);
- }
-
- if (ear_!=null && ear_.length()>0)
- {
- int earIndex = ear_.indexOf("/");
- if (earIndex!=-1) {
- earProject_ = ear_.substring(0,earIndex);
- ear_ = ear_.substring(earIndex+1);
- }
- }
-
-
- IWebServiceRuntime wsrt = WebServiceRuntimeExtensionUtils2.getServiceRuntime( serviceRuntimeId_ );
- WebServiceInfo wsInfo = new WebServiceInfo();
-
- wsInfo.setServerFactoryId( typeRuntimeServer_.getServerId() );
- wsInfo.setServerInstanceId( typeRuntimeServer_.getServerInstanceId());
- wsInfo.setState( WebServiceState.UNKNOWN_LITERAL );
- wsInfo.setWebServiceRuntimeId( typeRuntimeServer_.getRuntimeId() );
-
- environment.getLog().log(ILog.INFO, "ws_framework", 5107, this, "PreServiceDevelopCommand", "serviceRuntimeId_ = "+ serviceRuntimeId_);
- ServiceRuntimeDescriptor serviceRuntimeDescriptor = WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceRuntimeId_);
- IMerger merger = serviceRuntimeDescriptor.getServiceImplementationType().getMergerClass();
- wsInfo.setMerger(merger);
-
- webService_ = wsrt.getWebService( wsInfo );
-
- //Set up the IContext
- WebServiceScenario scenario = null;
- int scenarioInt = WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(typeRuntimeServer_.getTypeId());
- if (scenarioInt == WebServiceScenario.BOTTOMUP)
- {
- scenario = WebServiceScenario.BOTTOMUP_LITERAL;
- String impl = (String)(selection_.getSelection())[0];
- wsInfo.setImplURL(impl);
- }
- else if (scenarioInt == WebServiceScenario.TOPDOWN)
- {
- scenario = WebServiceScenario.TOPDOWN_LITERAL;
- String wsdlURL = (String)(selection_.getSelection())[0];
-
- // check for redirection in the wsdl
- HTTPUtility httpUtil = new HTTPUtility();
- String newWsdlURL = httpUtil.handleRedirect(wsdlURL);
-
- wsInfo.setWsdlURL( newWsdlURL );
-
- // Validate the url before proceeding.
- TimedWSDLSelectionConditionCommand timedCmd = new TimedWSDLSelectionConditionCommand();
- WebServicesParser parser = WSDLParserFactory.getWSDLParser();
-
- timedCmd.setWebServicesParser( parser );
- timedCmd.setWebServiceURI( newWsdlURL );
- timedCmd.execute( null, null );
-
- WebServiceEntity entity = parser.getWebServiceEntityByURI( newWsdlURL );
-
- if( entity == null || entity.getType() != WebServiceEntity.TYPE_WSDL )
- {
- // This isn't a wsdl file
- status = StatusUtils.errorStatus( ConsumptionUIMessages.PAGE_MSG_SELECTION_MUST_BE_WSDL );
- environment.getStatusHandler().reportError( status );
- return status;
- }
- }
-
- context_ = new SimpleContext(develop_, assemble_, deploy_, install_, run_, client_, test_, publish_,
- scenario,
- resourceContext_.isOverwriteFilesEnabled(),
- resourceContext_.isCreateFoldersEnabled(),
- resourceContext_.isCheckoutFilesEnabled());
-
- // Create the service module if needed.
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(project_);
- RequiredFacetVersion[] rfv = WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceRuntimeId_).getRequiredFacetVersions();
- if (!project.exists())
- {
- boolean matches = WebServiceRuntimeExtensionUtils2.doesServiceRuntimeSupportTemplate(serviceRuntimeId_, moduleType_);
- if (matches)
- {
- CreateFacetedProjectCommand command = new CreateFacetedProjectCommand();
- command.setProjectName(project_);
- command.setTemplateId(moduleType_);
- command.setRequiredFacetVersions(rfv);
- command.setServerFactoryId(typeRuntimeServer_.getServerId());
- command.setServerInstanceId(typeRuntimeServer_.getServerInstanceId());
- command.setEarProjectName(earProject_);
- status = command.execute( monitor, adaptable );
- if (status.getSeverity() == Status.ERROR)
- {
- environment.getStatusHandler().reportError( status );
- return status;
- }
- }
- } else {
- // add facets required by Web service runtime
- if (rfv.length != 0) {
- status = FacetUtils.addRequiredFacetsToProject(project, rfv, monitor);
- if (status.getSeverity() == Status.ERROR)
- {
- environment.getStatusHandler().reportError( status );
- return status;
- }
- }
- }
-
-
- if(initialProject_ != null && FacetUtils.isJavaProject(initialProject_) && scenarioInt == WebServiceScenario.BOTTOMUP){
- try{
- addJavaProjectAsUtilityInModalCtx(initialProject_, project, monitor);
- } catch (CoreException ce){
- String errorMessage = NLS.bind(ConsumptionUIMessages.MSG_ERROR_MODULE_DEPENDENCY, new String[]{project.getName(), initialProject_.getName()});
- IStatus errorStatus = StatusUtils.errorStatus(errorMessage);
- environment.getStatusHandler().reportError(errorStatus);
- } catch (IOException ioe){
- String errorMessage = NLS.bind(ConsumptionUIMessages.MSG_ERROR_MODULE_DEPENDENCY, new String[]{project.getName(), initialProject_.getName()});
- IStatus errorStatus = StatusUtils.errorStatus(errorMessage);
- environment.getStatusHandler().reportError(errorStatus);
- }
- }
- }
- return status;
-
- }
-
- /**
- * Adds the projectToAdd as utility to the ear project specified. The operation is executed in a modal context in order to avoid locking the workspace root in the UI thread
- */
- private void addJavaProjectAsUtilityInModalCtx(final IProject projectToAdd, final IProject earProject, final IProgressMonitor monitor) throws IOException, CoreException
- {
- final IRunnableWithProgress addRunnable = new IRunnableWithProgress()
- {
- public void run(final IProgressMonitor monitor) throws InvocationTargetException, InterruptedException
- {
- J2EEUtils.addJavaProjectAsUtilityJar(projectToAdd, earProject, monitor);
- try
- {
- final String uri = projectToAdd.getName() + ".jar";
- J2EEUtils.addJAROrModuleDependency(earProject, uri);
- } catch (IOException e)
- {
- throw new InvocationTargetException(e);
- } catch (CoreException e)
- {
- throw new InvocationTargetException(e);
- }
- }
- };
-
- try
- {
- ModalContext.run(addRunnable, true, monitor, PlatformUI.getWorkbench().getDisplay());
- } catch (InvocationTargetException e)
- {
- final Throwable cause = e.getCause();
- // IOExcetpion and CoreException thrown by J2EEUtils.addJAROrModuleDependency
- if(cause instanceof IOException)
- {
- throw (IOException)cause;
- }
- if(cause instanceof CoreException)
- {
- throw (CoreException)cause;
- }
-
- // Other unexpected exception has occurred, rethrow it as a runtime exception
- throw new RuntimeException(e);
- } catch (InterruptedException e)
- {
- // The executed runnable does not support cancellation and therefore this can never happen
- throw new IllegalStateException(e);
- }
- }
-
- public void setServiceTypeRuntimeServer( TypeRuntimeServer typeRuntimeServer )
- {
- typeRuntimeServer_ = typeRuntimeServer;
- }
-
- public void setServiceRuntimeId(String id)
- {
- serviceRuntimeId_ = id;
- }
-
- public void setServiceJ2EEVersion( String j2eeLevel )
- {
- j2eeLevel_ = j2eeLevel;
- }
-
- public String getJ2eeLevel()
- {
- return j2eeLevel_;
- }
-
- public IWebService getWebService()
- {
- return webService_;
- }
-
- public IContext getContext()
- {
- return context_;
- }
-
- public void setResourceContext( ResourceContext resourceContext )
- {
- resourceContext_ = resourceContext;
- }
-
- public ISelection getSelection()
- {
- return selection_;
- }
-
- public void setSelection( ISelection selection )
- {
- selection_ = selection;
- }
-
- public String getProject()
- {
- return project_;
- }
-
- public String getModule()
- {
- return module_;
- }
-
- public void setModule( String module )
- {
- module_ = module;
- }
-
- public void setModuleType(String type)
- {
- moduleType_ = type;
- }
-
- public String getEarProject()
- {
- return earProject_;
- }
-
- public String getEar()
- {
- return ear_;
- }
-
- public void setEar( String ear )
- {
- ear_ = ear;
- }
-
- public void setInstallService(boolean installService)
- {
- install_ = installService;
- }
-
- public void setDevelopService(boolean developService) {
- develop_ = developService;
- }
-
- public void setAssembleService(boolean assembleService) {
- assemble_ = assembleService;
- }
-
- public void setDeployService(boolean deployService) {
- deploy_ = deployService;
- }
-
- public void setStartService(boolean startService)
- {
- run_ = startService;
- }
-
- public void setTestService(boolean testService)
- {
- test_ = testService;
- }
-
- public void setPublishService(boolean publishService)
- {
- publish_ = publishService;
- }
-
- public void setGenerateProxy(boolean genProxy)
- {
- client_ = genProxy;
- }
-
- public void setInitialProject(IProject initialProject)
- {
- initialProject_ = initialProject;
- }
-
- public IProject getInitialProject()
- {
- return initialProject_;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceInstallCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceInstallCommand.java
deleted file mode 100644
index b864f54..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceInstallCommand.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2011 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070815 199626 kathy@ca.ibm.com - Kathy Chan
- * 20071130 203826 kathy@ca.ibm.com - Kathy Chan
- * 20080425 220985 - Trung, Server is recreated when prev publish failed
- * 20080429 220985 trungha@ca.ibm.com - Trung Ha
- * 20080520 233065 makandre@ca.ibm.com - Andrew Mak, Server not found error in Web service generation
- * 20110125 335246 mahutch@ca.ibm.com - Mark Hutchinson, Web Service Client Wizard should not publish JPA projects to the server
- *
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.creation.ui.extension;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.command.common.AddModuleToServerCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateServerCommand;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-
-public class PreServiceInstallCommand extends AbstractDataModelOperation
-{
- private IWebService webService_;
- private String project_;
- private String module_;
- private String earProject_;
- private String ear_;
- private IContext context_;
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- if (context_.getInstall())
- {
- IEnvironment environment = getEnvironment();
-
- if (webService_.getWebServiceInfo().getServerInstanceId()==null)
- {
- // Attempt to find a server instance in the workspace matching
- // the server id of the webService_
- // If we can find one, we don't need to create a new server.
- IServer[] allServers = ServerCore.getServers();
- if (allServers != null && allServers.length > 0) {
- for (int i = 0; i < allServers.length; i++) {
- IServer oneServer = allServers[i];
- if (oneServer.getServerType().getId().equals(
- webService_.getWebServiceInfo().getServerFactoryId())) {
-
- webService_.getWebServiceInfo().setServerInstanceId(oneServer.getId());
- webService_.getWebServiceInfo().setServerCreated(true);
- }
- }
- }
- // Cannot find an appropriate server, so we will create one
- if (webService_.getWebServiceInfo().getServerInstanceId() == null) {
- CreateServerCommand createServerCommand = new CreateServerCommand();
- createServerCommand.setServerFactoryid(webService_
- .getWebServiceInfo().getServerFactoryId());
- createServerCommand.setServerRuntimeId(webService_
- .getWebServiceInfo().getServerRuntimeId());
- createServerCommand.setEnvironment(environment);
- IStatus createServerStatus = createServerCommand.execute(
- monitor, null);
- if (createServerStatus.getSeverity() == Status.OK) {
- webService_.getWebServiceInfo().setServerInstanceId(
- createServerCommand.getServerInstanceId());
- webService_.getWebServiceInfo().setServerCreated(true);
- } else {
- if (createServerStatus.getSeverity() == Status.ERROR) {
- environment.getStatusHandler().reportError(
- createServerStatus);
- }
- return createServerStatus;
- }
- }
- }
-
- AddModuleToServerCommand command = new AddModuleToServerCommand();
- command.setServerInstanceId(webService_.getWebServiceInfo().getServerInstanceId());
- command.setEarProject(earProject_);
- command.setEarModule(ear_);
- command.setProject(project_);
- command.setModule(module_);
-
- command.setEnvironment( environment );
- IStatus status = command.execute( monitor, null );
- if (status.getSeverity()==Status.ERROR)
- {
- environment.getStatusHandler().reportError(status);
- }
- return status;
- }
- return Status.OK_STATUS;
- }
-
- public void setProject( String project )
- {
- project_ = project;
- }
-
- public void setModule( String module )
- {
- module_ = module;
- }
-
- public void setEarProject( String earProject )
- {
- earProject_ = earProject;
- }
-
- public void setEar( String ear )
- {
- ear_ = ear;
- }
-
- public void setWebService( IWebService webService )
- {
- webService_ = webService;
- }
-
- public void setContext(IContext context)
- {
- context_=context;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceRunCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceRunCommand.java
deleted file mode 100644
index b758bca..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceRunCommand.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.creation.ui.extension;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ui.command.StartServerCommand;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-
-public class PreServiceRunCommand extends AbstractDataModelOperation
-{
- private IWebService webService_;
- private IContext context_;
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IStatus status = Status.OK_STATUS;
- if (context_.getRun())
- {
- IEnvironment environment = getEnvironment();
-
- StartServerCommand command = new StartServerCommand();
- command.setServerInstanceId(webService_.getWebServiceInfo().getServerInstanceId());
- command.setEnvironment( environment );
- status = command.execute( monitor, null );
- if (status.getSeverity()==Status.ERROR)
- {
- environment.getStatusHandler().reportError(status);
- }
- }
-
- return status;
- }
-
- public void setWebService( IWebService webService )
- {
- webService_ = webService;
- }
-
- public void setContext (IContext context)
- {
- context_ = context;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/ServiceRootFragment.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/ServiceRootFragment.java
deleted file mode 100644
index d6e853a..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/ServiceRootFragment.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060131 121071 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060331 128827 kathy@ca.ibm.com - Kathy Chan
- * 20071212 200193 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.creation.ui.extension;
-
-import org.eclipse.jst.ws.internal.consumption.ui.extension.PreClientDevelopCommand;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.DataObjectCommand;
-import org.eclipse.wst.ws.internal.extensions.AssembleServiceFragment;
-import org.eclipse.wst.ws.internal.extensions.DeployServiceFragment;
-import org.eclipse.wst.ws.internal.extensions.DevelopServiceFragment;
-import org.eclipse.wst.ws.internal.extensions.InstallServiceFragment;
-import org.eclipse.wst.ws.internal.extensions.RunServiceFragment;
-
-public class ServiceRootFragment extends SequenceFragment
-{
- public ServiceRootFragment()
- {
- add( new SimpleFragment( new PreServiceDevelopCommand(), "" ) );
- add( new DevelopServiceFragment() );
- add( new SimpleFragment( new PreServiceAssembleCommand(), "" ) );
- add( new AssembleServiceFragment() );
- add( new SimpleFragment( new PreServiceDeployCommand(), "" ) );
- add( new DeployServiceFragment() );
- add( new SimpleFragment( new PreServiceInstallCommand(), "" ) );
- add( new InstallServiceFragment() );
- add( new SimpleFragment( new PreServiceRunCommand(),
- "org.eclipse.jst.ws.internal.creation.ui.extension.PreServiceRunCommand" ) );
- add( new RunServiceFragment() );
- }
-
- public void registerDataMappings(DataMappingRegistry registry)
- {
- //Mappings from framework to extension fragments
- registry.addMapping( PreServiceDevelopCommand.class, "WebService", DevelopServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Environment", DevelopServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Context", DevelopServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Selection", DevelopServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Project", DevelopServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Module", DevelopServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "EarProject", DevelopServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Ear", DevelopServiceFragment.class );
-
- // Map the PreServiceDevelopCommand into the dataObject and the PreClientDevelopCommand.
- registry.addMapping( PreServiceDevelopCommand.class, "WebService", DataObjectCommand.class, "DataObject", null );
- registry.addMapping( PreServiceDevelopCommand.class, "WebService", PreClientDevelopCommand.class, "DataObject", null );
-
- registry.addMapping( PreServiceDevelopCommand.class, "WebService", AssembleServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Environment", AssembleServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Context", AssembleServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Selection", AssembleServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Project", AssembleServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Module", AssembleServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "EarProject", AssembleServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Ear", AssembleServiceFragment.class );
-
- registry.addMapping( PreServiceDevelopCommand.class, "WebService", DeployServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Environment", DeployServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Context", DeployServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Selection", DeployServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Project", DeployServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Module", DeployServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "EarProject", DeployServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Ear", DeployServiceFragment.class );
-
- registry.addMapping( PreServiceDevelopCommand.class, "WebService", InstallServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Environment", InstallServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Context", InstallServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Selection", InstallServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Project", InstallServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Module", InstallServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "EarProject", InstallServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Ear", InstallServiceFragment.class );
-
- registry.addMapping( PreServiceDevelopCommand.class, "WebService", RunServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Environment", RunServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Context", RunServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Selection", RunServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Project", RunServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Module", RunServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "EarProject", RunServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Ear", RunServiceFragment.class );
-
- //Mappings from framework to framework commands
- registry.addMapping( PreServiceDevelopCommand.class, "WebService", PreServiceAssembleCommand.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Project", PreServiceAssembleCommand.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Module", PreServiceAssembleCommand.class );
- registry.addMapping( PreServiceDevelopCommand.class, "EarProject", PreServiceAssembleCommand.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Ear", PreServiceAssembleCommand.class );
- registry.addMapping( PreServiceDevelopCommand.class, "InitialProject", PreServiceAssembleCommand.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Context", PreServiceAssembleCommand.class );
-
- registry.addMapping( PreServiceDevelopCommand.class, "Context", PreServiceDeployCommand.class );
-
- registry.addMapping( PreServiceDevelopCommand.class, "WebService", PreServiceInstallCommand.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Project", PreServiceInstallCommand.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Module", PreServiceInstallCommand.class );
- registry.addMapping( PreServiceDevelopCommand.class, "EarProject", PreServiceInstallCommand.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Ear", PreServiceInstallCommand.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Context", PreServiceInstallCommand.class );
-
- registry.addMapping( PreServiceDevelopCommand.class, "WebService", PreServiceRunCommand.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Context", PreServiceRunCommand.class );
-
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/plugin/WebServiceCreationUIPlugin.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/plugin/WebServiceCreationUIPlugin.java
deleted file mode 100644
index 47b8a0b..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/plugin/WebServiceCreationUIPlugin.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060424 115690 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060504 138118 joan@ca.ibm.com - Joan Haggarty
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.plugin;
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-
-
-/**
-* This is the plugin class for the Web Services Creation UI plugin.
-* <p>
-* The Web Services Creation UI plugin's sole function is to add
-* user interface of the Web Services Creation Wizard, contained in
-* the org.eclipse.jst.ws.ui plugin.
-*/
-public class WebServiceCreationUIPlugin extends Plugin
-{
-
- /**
- * The identifier of the descriptor of this plugin in plugin.xml.
- */
- public static final String ID = "org.eclipse.jst.ws.creation.ui";
-
- /**
- * The reference to the singleton instance of this plugin.
- */
- private static WebServiceCreationUIPlugin instance_;
-
- /**
- * Constructs a runtime plugin object for this plugin.
- * The "plugin" element in plugin.xml should include the attribute
- * class = "org.eclipse.jst.ws.internal.creation.ui.plugin.WebServiceCreationUIPlugin".
- * @param descriptor The descriptor of this plugin.
- */
- public WebServiceCreationUIPlugin ()
- {
- super();
- instance_ = this;
- }
-
- /**
- * Returns the singleton instance of this plugin. Equivalent to calling
- * (WebServiceCreationUIPlugin)Platform.getPlugin("org.eclipse.jst.ws.creation.ui");
- * @return The WebServiceCreationUIPlugin singleton.
- */
- public static WebServiceCreationUIPlugin getInstance ()
- {
- return instance_;
- }
-
- /**
- * Returns an image descriptor for the named resource
- * as relative to the plugin install location.
- * @return An image descriptor, possibly null.
- */
- public static ImageDescriptor getImageDescriptor ( String name )
- {
- try
- {
- URL imageURL = FileLocator.find(instance_.getBundle(), new Path("$nl$/"+name), null);
- return ImageDescriptor.createFromURL(imageURL);
- }
- catch (Exception e)
- {
- return null;
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/preferences/ScenarioDefaultsPreferencePage.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/preferences/ScenarioDefaultsPreferencePage.java
deleted file mode 100644
index 34e09f1..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/preferences/ScenarioDefaultsPreferencePage.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060417 136391 joan@ca.ibm.com - Joan Haggarty
- * 20060529 141422 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.preferences;
-
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidget;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-
-
-/**
- *
- */
-public class ScenarioDefaultsPreferencePage extends PreferencePage implements IWorkbenchPreferencePage
-{
- private ServerWizardWidget serverWidget_ = null;
-
- public void init(IWorkbench workbench) { }
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
- */
-
- protected Control createContents(Composite parent)
- {
- UIUtils utils = new UIUtils(null);
-
- Composite page = utils.createComposite( parent, 1 );
-
- serverWidget_ = new ServerWizardWidget( false, true );
- serverWidget_.addControls( page, new Listener()
- {
- public void handleEvent( Event evt ){}
- } );
- initializeValues();
- serverWidget_.disableNonPreferenceWidgets();
- applyDialogFont(page);
- return page;
- }
-
- private void initializeValues()
- {
- ScenarioContext context = WebServicePlugin.getInstance().getScenarioContext();
-
- // Set values from context.
- TypeRuntimeServer serverIds = new TypeRuntimeServer();
- TypeRuntimeServer clientIds = new TypeRuntimeServer();
-
- serverIds.setTypeId( context.getWebServiceType() );
- clientIds.setTypeId( context.getClientWebServiceType() );
-
- serverWidget_.setServiceTypeRuntimeServer( serverIds );
- serverWidget_.setClientTypeRuntimeServer( clientIds );
- //jvh serverWidget_.setGenerateProxy( new Boolean(context.getGenerateProxy()) );
- serverWidget_.setPublishService( new Boolean(context.getLaunchWebServiceExplorer()) );
- serverWidget_.setInstallService( new Boolean(context.getInstallWebService()) );
- serverWidget_.setInstallClient( new Boolean(context.getInstallClient()) );
- serverWidget_.setStartService( new Boolean(context.getStartWebService()) );
- serverWidget_.setTestService( new Boolean(context.getTestWebService()) );
- serverWidget_.setTestClient( new Boolean(context.getTestWebService()) );
- serverWidget_.setMonitorService(new Boolean(context.getMonitorWebService()));
- serverWidget_.setServiceGeneration(context.getGenerateWebService()); //jvh
- serverWidget_.setClientGeneration(context.getGenerateClient()); //jvh
- serverWidget_.internalize();
- }
-
- /**
- * Does anything necessary because the default button has been pressed.
- */
- protected void performDefaults()
- {
- super.performDefaults();
- setToDefaults();
- }
-
- private void setToDefaults()
- {
- ScenarioContext context = WebServicePlugin.getInstance().getScenarioContext();
-
- // Set values from context.
- TypeRuntimeServer serverIds = new TypeRuntimeServer();
- TypeRuntimeServer clientIds = new TypeRuntimeServer();
-
- serverIds.setTypeId( context.getWebServiceTypeDefault() );
- clientIds.setTypeId( context.getClientWebServiceTypeDefault() );
-
- serverWidget_.setServiceTypeRuntimeServer( serverIds );
- serverWidget_.setClientTypeRuntimeServer( clientIds );
- serverWidget_.setPublishService( new Boolean(context.getLaunchWebServiceExplorerDefault()) );
- serverWidget_.setInstallService( new Boolean(context.getInstallWebServiceDefault()) );
- serverWidget_.setInstallClient( new Boolean(context.getInstallClientDefault()) );
- serverWidget_.setStartService( new Boolean(context.getStartWebServiceDefault()) );
- serverWidget_.setTestService( new Boolean(context.getTestWebServiceDefault()) );
- serverWidget_.setTestClient( new Boolean(context.getTestWebServiceDefault()) );
- serverWidget_.setMonitorService(new Boolean(context.getMonitorWebServiceDefault()));
- serverWidget_.setServiceGeneration(context.getGenerateWebServiceDefault()); //jvh
- serverWidget_.setClientGeneration(context.getGenerateClientDefault()); //jvh
- serverWidget_.internalize();
- }
-
- /**
- * Do anything necessary because the OK button has been pressed.
- * @return whether it is okay to close the preference page
- */
- public boolean performOk()
- {
- storeValues();
- return true;
- }
-
- private void storeValues()
- {
- ScenarioContext context = WebServicePlugin.getInstance().getScenarioContext();
-
- TypeRuntimeServer serverIds = serverWidget_.getServiceTypeRuntimeServer();
- TypeRuntimeServer clientIds = serverWidget_.getClientTypeRuntimeServer();
-
- context.setWebServiceType( serverIds.getTypeId() );
- context.setClientWebServiceType( clientIds.getTypeId() );
- context.setGenerateProxy( serverWidget_.getGenerateProxy().booleanValue() );
- context.setLaunchWebServiceExplorer( serverWidget_.getPublishService().booleanValue() );
- context.setInstallWebService( serverWidget_.getInstallService().booleanValue() );
- context.setInstallClient( serverWidget_.getInstallClient().booleanValue() );
- context.setStartWebService( serverWidget_.getStartService().booleanValue() );
- context.setTestWebService( serverWidget_.getTestService().booleanValue() );
- context.setMonitorWebService(serverWidget_.getMonitorService().booleanValue());
- context.setGenerateWebService(serverWidget_.getServiceGeneration());
- context.setGenerateClient(serverWidget_.getClientGeneration());
- }
-
- protected void performApply()
- {
- performOk();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetContributor.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetContributor.java
deleted file mode 100644
index fc96c1c..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetContributor.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.creation.ui.server;
-
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.server.StartServerWidget;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.server.core.IServer;
-
-public class StartServerWidgetContributor implements INamedWidgetContributor
-{
- private IServer server_;
-
- public StartServerWidgetContributor( IServer server )
- {
- server_ = server;
- }
-
- public String getDescription()
- {
- return ConsumptionUIMessages.PAGE_DESC_WS_START_SERVER;
- }
-
- public String getName()
- {
- return "";
- }
-
- public String getTitle()
- {
- return ConsumptionUIMessages.PAGE_TITLE_WS_START_SERVER;
- }
-
- public WidgetContributorFactory getWidgetContributorFactory()
- {
- return new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new StartServerWidget( server_ );
- }
- };
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetFactory.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetFactory.java
deleted file mode 100644
index 98717b1..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetFactory.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060529 141422 kathy@ca.ibm.com - Kathy Chan
- * 20070328 173345 pmoogk@ca.ibm.com - Peter Moogk, Peek next page problem
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.creation.ui.server;
-
-import org.eclipse.jst.ws.internal.creation.ui.extension.PreServiceDevelopCommand;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributorFactory;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-
-public class StartServerWidgetFactory implements INamedWidgetContributorFactory
-{
- private IWebService webservice_;
- private IContext context_;
-
- public INamedWidgetContributor getFirstNamedWidget()
- {
- IServer server = null;
-
- if( webservice_ != null && context_.getRun())
- {
- String instanceId = webservice_.getWebServiceInfo().getServerInstanceId();
-
- if( instanceId != null && instanceId.length() > 0 )
- {
- server = ServerCore.findServer( instanceId );
- }
- }
-
- if( server != null && server.getServerState() != IServer.STATE_STARTED )
- {
- return new StartServerWidgetContributor( server );
- }
-
- return null;
- }
-
- public INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor)
- {
- return null;
- }
-
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- dataRegistry.addMapping( PreServiceDevelopCommand.class, "WebService", StartServerWidgetFactory.class );
- dataRegistry.addMapping( PreServiceDevelopCommand.class, "Context", StartServerWidgetFactory.class );
- }
-
- public void setWebService( IWebService webservice )
- {
- webservice_ = webservice;
- }
- public void setContext ( IContext context )
- {
- context_ = context;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidget.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidget.java
deleted file mode 100644
index 4cea165..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidget.java
+++ /dev/null
@@ -1,1746 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060407 135415 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060407 135443 joan@ca.ibm.com - Joan Haggarty
- * 20060410 135442 kathy@ca.ibm.com - Kathy Chan
- * 20060410 135441 joan@ca.ibm.com - Joan Haggarty
- * 20060410 135562 joan@ca.ibm.com - Joan Haggarty
- * 20060411 136167 kathy@ca.ibm.com - Kathy Chan
- * 20060417 136390/136391/136159 joan@ca.ibm.com - Joan Haggarty
- * 20060413 135581 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060420 136158 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060420 136705 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060420 136182 kathy@ca.ibm.com - Kathy Chan
- * 20060420 137820 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060420 135912 joan@ca.ibm.com - Joan Haggarty
- * 20060421 136761 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060424 138052 kathy@ca.ibm.com - Kathy Chan
- * 20060425 137831 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060426 138519 joan@ca.ibm.com - Joan Haggarty
- * 20060427 138058 joan@ca.ibm.com - Joan Haggarty
- * 20060504 138035 joan@ca.ibm.com - Joan Haggarty
- * 20060524 142276 joan@ca.ibm.com - Joan Haggarty
- * 20060529 141422 kathy@ca.ibm.com - Kathy Chan
- * 20060605 145081 joan@ca.ibm.com - Joan Haggarty
- * 20060607 144826 joan@ca.ibm.com - Joan Haggarty
- * 20060607 144049 joan@ca.ibm.com - Joan Haggarty
- * 20060614 146270 joan@ca.ibm.com - Joan Haggarty
- * 20060616 147317 joan@ca.ibm.com - Joan Haggarty
- * 20060717 150577 makandre@ca.ibm.com - Andrew Mak
- * 20060726 150865 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060803 152486 makandre@ca.ibm.com - Andrew Mak, Typing WSDL in Service definition field is very slow
- * 20060817 140017 makandre@ca.ibm.com - Andrew Mak, longer project or server/runtime strings do not resize wizard
- * 20060825 135570 makandre@ca.ibm.com - Andrew Mak, Service implementation URL not displayed properly on first page
- * 20060829 155441 makandre@ca.ibm.com - Andrew Mak, web service wizard hangs during resize
- * 20060830 155114 pmoogk@ca.ibm.com - Peter Moogk, Updated patch for this defect.
- * 20060831 155441 makandre@ca.ibm.com - Andrew Mak, Small tweak for this bug
- * 20061003 159142 kathy@ca.ibm.com - Kathy Chan
- * 20061212 164177 makandre@ca.ibm.com - Andrew Mak, Incorrect validation error complaining about runtime not supporting a project type
- * 20061212 159911 makandre@ca.ibm.com - Andrew Mak, changing service definition resets some configuration fields
- * 20070205 172687 makandre@ca.ibm.com - Andrew Mak, NPE in Scencario Defaults preferences page
- * 20071130 203826 kathy@ca.ibm.com - Kathy Chan
- * 20080205 170141 kathy@ca.ibm.com - Kathy Chan
- * 20080215 216337 pmoogk@ca.ibm.com - Peter Moogk
- * 20080301 221034 kathy@ca.ibm.com - Kathy Chan
- * 20080312 147442 trungha@ca.ibm.com - Trung Ha
- * 20080318 213330 trungha@ca.ibm.com - Trung, Non-conventional Java naming prevents creating Web Services (client)
- * 20080326 198439 kathy@ca.ibm.com - Kathy Chan
- * 20080402 198439 kathy@ca.ibm.com - Kathy Chan
- * 20080416 215084 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080417 227599 kathy@ca.ibm.com - Kathy Chan
- * 20080613 236523 makandre@ca.ibm.com - Andrew Mak, Overwrite setting on Web service wizard is coupled with preference
- * 20090926 248448 mahutch@ca.ibm.com - Mark Hutchinson, Should not resize WS Wizard for long WSDL file names
- * 20090121 261730 zhang@ca.ibm.com - Allan Zhang, WebService client runtime id return null
- * 20090302 242462 ericdp@ca.ibm.com - Eric D. Peters, Save Web services wizard settings
- * 20090313 268567 ericdp@ca.ibm.com - Eric D. Peters, persisted wizard settings gone unless launching on object
- * 20090326 269097 kchong@ca.ibm.com - Keith Chong, [Accessibility] Web services wizard dialog should be selected after canceling the Browse for class dialog
- * 20100511 309395 mahutch@ca.ibm.com - Mark Hutchinson, WS Wizard Converting Java Project into Utility Project without any warning
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets;
-
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.common.DefaultingUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ValidationUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.IObjectSelectionLaunchable;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.IPackable;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ProjectSelectionDialog;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.WebServiceClientTypeWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.IObjectSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionRegistry;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.Timer;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ProjectSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.RuntimeServerSelectionDialog;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceImpl;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.creation.ui.plugin.WebServiceCreationUIPlugin;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.runtime.ServerRuntimeSelectionWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.data.LabelsAndIds;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.jst.ws.internal.ui.common.ComboWithHistory;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.Accessible;
-import org.eclipse.swt.accessibility.AccessibleAdapter;
-import org.eclipse.swt.accessibility.AccessibleControlAdapter;
-import org.eclipse.swt.accessibility.AccessibleControlEvent;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.ControlListener;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Rectangle;
-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.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Scale;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.HyperlinkGroup;
-import org.eclipse.ui.forms.HyperlinkSettings;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.Hyperlink;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.env.ui.widgets.PageInfo;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.ws.internal.ui.plugin.WSUIPlugin;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntimeChecker;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-public class ServerWizardWidget extends SimpleWidgetDataContributor implements Runnable, IPackable {
-
- //INFOPOPS
- /* CONTEXT_ID WSWSCEN0001 for the Scenario Page */
- private String INFOPOP_WSWSCEN_PAGE = "WSWSCEN0001";
- /* CONTEXT_ID WSWSCEN0010 for the Web Service Type combo box of the Scenario Page */
- private String INFOPOP_WSWSCEN_COMBO_SERVICETYPE = "WSWSCEN0010";
- /* CONTEXT_ID WSWSCEN0014 for the monitor service checkbox of the Scenario page */
- private String INFOPOP_WSWSCEN_CHECKBOX_MONITOR_SERVICE = "WSWSCEN0014";
- /* CONTEXT_ID WSWSCEN0012 for the Launch UDDI check box of the Scenario Page */
- private String INFOPOP_WSWSCEN_CHECKBOX_LAUNCH_WS = "WSWSCEN0012";
- /* CONTEXT_ID WSWSCEN0020 for the Service Implemenation text field of the Scenario Page */
- private String INFOPOP_WSWSCEN_TEXT_SERVICE_IMPL = "WSWSCEN0020";
- /* CONTEXT_ID WSWSCEN0021 for theService Slider of the Scenario Page */
- private String INFOPOP_WSWSCEN_SCALE_SERVICE = "WSWSCEN0021";
- /* CONTEXT_ID WSWSCEN0022 for the Server hyperlink of the Scenario Page */
- private String INFOPOP_WSWSCEN_HYPERLINK_SERVER = "WSWSCEN0022";
- /* CONTEXT_ID WSWSCEN0023 for the Runtime hyperlink of the Scenario Page */
- private String INFOPOP_WSWSCEN_HYPERLINK_RUNTIME = "WSWSCEN0023";
- /* CONTEXT_ID WSWSCEN0024 for theProjects hyperlink of the Scenario Page */
- private String INFOPOP_WSWSCEN_HYPERLINK_PROJECTS = "WSWSCEN0024";
- /* CONTEXT_ID WSWSCEN0030 for the Overwrite Files checkbox of the Scenario Page */
- private String INFOPOP_WSWSCEN_CHECKBOX_OVERWRITE = "WSWSCEN0030";
-
- private ScaleSelectionListener scaleSelectionListener = new ScaleSelectionListener();
- private Listener statusListener_;
- private ModifyListener objectModifyListener_ ;
- private int validationState_;
- boolean validObjectSelection_ = true;
-
- private ImageRegistry imageReg_;
-
- private TypeRuntimeServer ids_;
- private LabelsAndIds labelIds_;
- private String serviceProjectName_;
- private IProject initialProject_;
- private String serviceEarProjectName_;
- private String serviceComponentType_;
- private WebServicesParser parser_;
- private boolean needEar_;
-
- private boolean developService_;
- private boolean assembleService_;
- private boolean deployService_;
-
- private IStructuredSelection objectSelection_;
- private Boolean testService_;
- private Boolean startService_;
- private Boolean installService_;
-
- private boolean displayPreferences_;
- private boolean preferencesPage_;
-
- private Composite groupComposite_;
- private Composite hCompService_;
- private WebServiceClientTypeWidget clientWidget_;
- private Label serviceLabel_;
- private Combo webserviceType_;
- private ComboWithHistory serviceImpl_;
- private Scale serviceScale_;
- private Label topologySpot_;
- private Button browseButton_;
- private Button publishButton_;
- private Button monitorButton_;
- private Button overwriteButton_;
- private ServiceImplSelectionDialog browseDialog_;
- private ProjectSelectionDialog projectDialog_;
- private Hyperlink hLinkServiceRuntime_;
- private Hyperlink hLinkServiceServer_;
- private Hyperlink hLinkServiceProject_;
- private Hyperlink hLinkServiceEAR_;
-
- private Object objectSelectionWidget_; //may be IObjectSelectionLaunchable or IObjectSelectionWidget
-
- private ResourceContext resourceContext_;
-
- private Timer timer_ = null;
-
- private UIUtils utils_ = new UIUtils("org.eclipse.jst.ws.creation.ui");
-
- private boolean forceRefreshRuntime = false;
-
- private String GRAPHIC_SERVICE_0="icons/service_test.jpg"; //$NON-NLS-N$
- private String GRAPHIC_SERVICE_1="icons/service_run.jpg"; //$NON-NLS-N$
- private String GRAPHIC_SERVICE_2="icons/service_install.jpg"; //$NON-NLS-N$
- private String GRAPHIC_SERVICE_3="icons/service_deploy.jpg"; //$NON-NLS-N$
- private String GRAPHIC_SERVICE_4="icons/service_assemble.jpg"; //$NON-NLS-N$
- private String GRAPHIC_SERVICE_5="icons/service_develop.jpg"; //$NON-NLS-N$
-
- private String ICON_SCALE_BG_0="icons/scale0_bground.jpg"; //$NON-NLS-N$
- private String ICON_SCALE_BG_1="icons/scale1_bground.jpg"; //$NON-NLS-N$
- private String ICON_SCALE_BG_2="icons/scale2_bground.jpg"; //$NON-NLS-N$
- private String ICON_SCALE_BG_3="icons/scale3_bground.jpg"; //$NON-NLS-N$
- private String ICON_SCALE_BG_4="icons/scale4_bground.jpg"; //$NON-NLS-N$
- private String ICON_SCALE_BG_5="icons/scale5_bground.jpg"; //$NON-NLS-N$
- private String ICON_SCALE_BG_6="icons/scale6_bground.jpg"; //$NON-NLS-N$
-
- private String SERVICE_RUNTIME_PREFIX = ConsumptionUIMessages.LABEL_RUNTIMES_LIST ;
- private String SERVICE_SERVER_PREFIX = ConsumptionUIMessages.LABEL_SERVERS_LIST;
- private String SERVICE_PROJECT_PREFIX = ConsumptionUIMessages.LABEL_SERVICE_PROJECT;
- private String SERVICE_EAR_PREFIX = ConsumptionUIMessages.LABEL_SERVICE_EAR_PROJECT;
-
- /**
- * @param displayPreferences Set to true if preferences such as overwrite should be displayed on the wizard page
- * @param prefPage Set to true if the widget is being used on the preferences page. Alters widget layout.
- */
- public ServerWizardWidget(boolean displayPreferences, boolean prefPage) {
- displayPreferences_ = displayPreferences;
- preferencesPage_ = prefPage;
- initImageRegistry();
- validationState_ = ValidationUtils.VALIDATE_ALL;
- }
-
- private Composite serviceComposite_;
-
- /**
- * Run this ServerWizardWidget, which validates the entry field values.
- */
- public void run() {
-
- // do minimal check here, this call will determine if we at least
- // have a "validObjectSelection_"
- checkServiceImplTextStatus();
-
- if (validObjectSelection_)
- {
- boolean refreshRuntime = (getWebServiceScenario() != WebServiceScenario.TOPDOWN);
-
- if (objectSelectionWidget_ instanceof IObjectSelectionLaunchable)
- {
- IObjectSelectionLaunchable launchable = (IObjectSelectionLaunchable)objectSelectionWidget_;
- callObjectTransformation(launchable.getObjectSelection(), launchable.getProject(), launchable.getComponentName(), refreshRuntime);
- }
- else
- {
- IObjectSelectionWidget widget = (IObjectSelectionWidget)objectSelectionWidget_;
- callObjectTransformation(widget.getObjectSelection(), widget.getProject(), widget.getComponentName(), refreshRuntime);
- }
- }
- else
- setObjectSelection(null);
-
- // do full validation after all transformations and calculations have occurred
- validationState_ = ValidationUtils.VALIDATE_ALL;
- statusListener_.handleEvent(null);
- }
-
- /**
- * Pack this widget and the client-side widget as well.
- */
- private void packSelf() {
- // don't need to call packIt(), since clientWidget_ has a callback to packIt() already.
- clientWidget_.packIt();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.consumption.ui.widgets.IPackable#packIt()
- */
- public void packIt() {
- groupComposite_.pack(true);
- utils_.horizontalResize(groupComposite_.getShell(), groupComposite_, UIUtils.DEFAULT_PADDING);
- }
-
- public WidgetDataEvents addControls(Composite parent,
- Listener statusListener) {
-
- statusListener_ = statusListener;
- utils_.createInfoPop(parent, INFOPOP_WSWSCEN_PAGE);
-
- Composite typeComposite = utils_.createComposite(parent, 3);
-
- webserviceType_ = utils_.createCombo(typeComposite,
- ConsumptionUIMessages.LABEL_WEBSERVICETYPE,
- ConsumptionUIMessages.TOOLTIP_PWPR_COMBO_TYPE,
- INFOPOP_WSWSCEN_COMBO_SERVICETYPE, SWT.SINGLE | SWT.BORDER
- | SWT.READ_ONLY);
- GridData gdata1 = (GridData) webserviceType_.getLayoutData();
- gdata1.horizontalSpan = 2;
- webserviceType_.setLayoutData(gdata1);
-
- webserviceType_.addSelectionListener(new SelectionListener(){
- public void widgetDefaultSelected(SelectionEvent e) {}
-
- public void widgetSelected(SelectionEvent e) {
- String oldTypeId = ids_.getTypeId();
- int currentSelectionIdx = webserviceType_.getSelectionIndex();
- String currentTypeId = labelIds_.getIds_()[currentSelectionIdx];
- if (!oldTypeId.equals(currentTypeId)) {
- ids_.setTypeId(currentTypeId);
-
- // don't need to refresh runtime or validate fields if we are on the preference page, just return
- if (preferencesPage_)
- return;
-
- int oldScenario = WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(oldTypeId);
- int currentScenario = WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(currentTypeId);
-
- objectSelectionWidget_ = getSelectionWidget();
- // change the label for the service
- // implementation/definition based on the web service type
- handleTypeChange();
-
- // After bug 159911, we will not refresh the runtime in TOPDOWN scenario unless we absolutely
- // have to. Therefore, if we are switching from another scenario type, we should check if the
- // current selections are valid for this TOPDOWN scenario, if not, try to pick a more suitable
- // runtime.
- if (currentScenario == WebServiceScenario.TOPDOWN) {
- validationState_ = ValidationUtils.VALIDATE_SERVER_RUNTIME_CHANGES;
-
- // this will force a refresh the next time the wsdl is changed
- forceRefreshRuntime = !checkErrorStatus().isOK();
- }
-
- //if the web service type change is from one top-down type to another
- //top-down type leave the object selection field in tact and refresh
- //the server/runtime project defaulting.
- //Otherwise clear the object selection field since it's value is not valid anymore
- if (oldScenario==WebServiceScenario.TOPDOWN && currentScenario==WebServiceScenario.TOPDOWN)
- {
- // if switching from one TOPDOWN scenario to another TOPDOWN scenario and
- // we've determined that the current runtime selection is not suitable, we
- // can refresh the runtime now (don't need to wait for the next time the
- // wsdl is changed).
- if (forceRefreshRuntime) {
- refreshServerRuntimeSelection();
- forceRefreshRuntime = false;
- }
- }
- else
- {
- //clear the object selection field
- // serviceImpl may be null if on the preferences page
- if (serviceImpl_ != null)
- {
- serviceImpl_.removeModifyListener(objectModifyListener_);
- serviceImpl_.setText("");
- setObjectSelection(null);
- serviceImpl_.addModifyListener(objectModifyListener_);
- }
- }
- //restore widget values, serviceImpl may be null if on the preferences page
- if (serviceImpl_ != null) {
- String webServiceTypeID= null;
- if (ids_ != null)
- webServiceTypeID = ids_.getTypeId();
- serviceImpl_.removeModifyListener(objectModifyListener_);
- String currentlySelectedValue = serviceImpl_.getText();
- serviceImpl_.removeAll();
- if (currentlySelectedValue != null)
- serviceImpl_.setText(currentlySelectedValue);
- serviceImpl_.restoreWidgetHistory(webServiceTypeID);
- serviceImpl_.addModifyListener(objectModifyListener_);
-
- }
-
- validationState_ = ValidationUtils.VALIDATE_ALL;
- statusListener_.handleEvent(null);
-
- }
- }
-
- });
-
- // Create text field and browse for object selection if not on preferences page
- if (!preferencesPage_)
- {
- //text of this label is based on the web service type selected in webserviceType_ combo
- serviceLabel_ = new Label( typeComposite, SWT.WRAP);
- serviceLabel_.setText(ConsumptionUIMessages.LABEL_WEBSERVICEIMPL);
- serviceLabel_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_TEXT_IMPL);
-
- serviceImpl_ = new ComboWithHistory(typeComposite, SWT.LEFT | SWT.BORDER, WSUIPlugin.getInstance().getDialogSettings());
- GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
- griddata.widthHint = 225;
- serviceImpl_.setLayoutData( griddata );
- serviceImpl_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_TEXT_IMPL);
- utils_.createInfoPop(serviceImpl_, INFOPOP_WSWSCEN_TEXT_SERVICE_IMPL);
-
- objectModifyListener_ = new ModifyListener(){
- public void modifyText(ModifyEvent e) {
- if (serviceImpl_.getText().indexOf(':') > 0) {
- timer_ = Timer.newInstance(timer_, Display.getCurrent(), ServerWizardWidget.this);
- timer_.startTimer();
- }
- else
- run();
- }
- };
-
- serviceImpl_.addModifyListener(objectModifyListener_);
- serviceImpl_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent e) {
- int index = serviceImpl_.getSelectionIndex();
- serviceImpl_.removeModifyListener(objectModifyListener_);
- serviceImpl_.setText(serviceImpl_.getItem(index));
- serviceImpl_.addModifyListener(objectModifyListener_);
- }
- });
- browseButton_ = utils_.createPushButton(typeComposite,
- ConsumptionUIMessages.BUTTON_BROWSE, ConsumptionUIMessages.TOOLTIP_WSWSCEN_BUTTON_BROWSE_IMPL, null);
-
- browseButton_.addSelectionListener(new ServiceImplBrowseListener());
- }
- // Service Lifecycle section - scales for service & client, graphic
-
- groupComposite_ = new Composite(parent, SWT.NONE);
- GridLayout gclayout = new GridLayout();
- gclayout.numColumns = 2;
- gclayout.horizontalSpacing=0;
- gclayout.marginHeight=0;
- gclayout.marginBottom=5;
- groupComposite_.setLayout( gclayout );
- GridData gcGridData = new GridData(SWT.BEGINNING, SWT.BEGINNING, true, true);
- groupComposite_.setLayoutData(gcGridData);
-
- groupComposite_.addControlListener(new ControlListener()
- {
- public void controlMoved(ControlEvent e) {
- // TODO Auto-generated method stub
-
- }
- public void controlResized(ControlEvent e) {
- groupComposite_.pack(true);
- }
- });
-
- serviceComposite_ = new Composite(groupComposite_, SWT.NONE);
- GridLayout gridlayout = new GridLayout();
- gridlayout.numColumns = 2;
- gridlayout.horizontalSpacing=0;
- gridlayout.marginHeight=0;
- serviceComposite_.setLayout( gridlayout );
- GridData scGridData = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- serviceComposite_.setLayoutData(scGridData);
-
- serviceComposite_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_SERVICE);
-
-
- serviceScale_ = new Scale(serviceComposite_, SWT.VERTICAL | SWT.BORDER);
- utils_.createInfoPop(serviceScale_, INFOPOP_WSWSCEN_SCALE_SERVICE);
- serviceScale_.setMinimum(0);
- serviceScale_.setMaximum(6);
- serviceScale_.setIncrement(1);
- serviceScale_.setPageIncrement(1);
- serviceScale_.addSelectionListener(scaleSelectionListener);
- serviceScale_.setSelection(getServiceGeneration());
- serviceScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_SERVICE);
-
- Accessible accessibleScale = serviceScale_.getAccessible();
- accessibleScale.addAccessibleListener(new AccessibleAdapter(){
- // return a string that describes what to do with the slider
- // this is read by the screen reader when the slider first gets focus
- public void getName(AccessibleEvent e) {
- e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_SERVICE;
- }
- });
- accessibleScale.addAccessibleControlListener(new AccessibleControlAdapter(){
- // return a meaningful string when the screen reader
- // attempts to get the value from the service scale
- public void getValue(AccessibleControlEvent e) {
- int selection = serviceScale_.getSelection();
- switch (selection) {
- case 0:
- e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_TEST;
- break;
- case 1:
- e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_RUN;
- break;
- case 2:
- e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_INSTALL;
- break;
- case 3:
- e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_DEPLOY;
- break;
- case 4:
- e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_ASSEMBLE;
- break;
- case 5:
- case 6:
- e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_DEVELOP;
- break;
- default:
- break;
- }
- }
- });
-
- GridData layoutData1 = new GridData();
- layoutData1.horizontalAlignment=SWT.CENTER;
- layoutData1.verticalAlignment = SWT.BEGINNING;
- Rectangle scaleR = (imageReg_.get(ICON_SCALE_BG_0)).getBounds();
- layoutData1.heightHint=scaleR.height;
- layoutData1.widthHint=scaleR.width+1;
- serviceScale_.setLayoutData(layoutData1);
-
- topologySpot_ = new Label(serviceComposite_, SWT.BORDER | SWT.TOP );
- topologySpot_.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
- topologySpot_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_SERVICE);
-
- GridData layoutData2 = new GridData();
- layoutData2.horizontalAlignment=SWT.BEGINNING;
- layoutData2.verticalAlignment = SWT.BEGINNING;
- Rectangle topR = (imageReg_.get(GRAPHIC_SERVICE_0)).getBounds();
- layoutData2.heightHint=topR.height;
- layoutData2.widthHint=topR.width;
- topologySpot_.setLayoutData(layoutData2);
-
- setGraphics(getServiceGeneration());
-
- hCompService_ = utils_.createComposite(groupComposite_, 1);
-
- Label serviceDetailsLabel = new Label(hCompService_, SWT.NONE);
- serviceDetailsLabel.setText(ConsumptionUIMessages.LABEL_SUMMARY);
-
- hLinkServiceServer_= new Hyperlink(hCompService_, SWT.NULL);
- utils_.createInfoPop(hLinkServiceServer_, INFOPOP_WSWSCEN_HYPERLINK_SERVER);
- hLinkServiceServer_.setToolTipText(ConsumptionUIMessages.TOOLTIP_PWRS_TEXT_SERVER);
- hLinkServiceServer_.addHyperlinkListener(new IHyperlinkListener(){
- public void linkActivated(HyperlinkEvent e){
- launchRuntimeSelectionDialog(false, true);
- }
- public void linkEntered(HyperlinkEvent e){}
- public void linkExited(HyperlinkEvent e){}
- });
-
- hLinkServiceRuntime_ = new Hyperlink(hCompService_, SWT.NULL);
- utils_.createInfoPop(hLinkServiceRuntime_, INFOPOP_WSWSCEN_HYPERLINK_RUNTIME);
- hLinkServiceRuntime_.setToolTipText(ConsumptionUIMessages.TOOLTIP_PWRS_TEXT_RUNTIME);
- hLinkServiceRuntime_.addHyperlinkListener(new IHyperlinkListener(){
- public void linkActivated(HyperlinkEvent e){
- launchRuntimeSelectionDialog(false);
- }
- public void linkEntered(HyperlinkEvent e){}
- public void linkExited(HyperlinkEvent e){}
- });
-
- IWorkbench workbench = PlatformUI.getWorkbench();
- projectDialog_ = new ProjectSelectionDialog(workbench.getActiveWorkbenchWindow().getShell(),
- new PageInfo(ConsumptionUIMessages.DIALOG_TITILE_SERVICE_PROJECT_SETTINGS, "",
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new ProjectSelectionWidget();
- }
- }));
-
- hLinkServiceProject_= new Hyperlink(hCompService_, SWT.NULL);
- utils_.createInfoPop(hLinkServiceRuntime_, INFOPOP_WSWSCEN_HYPERLINK_PROJECTS);
- hLinkServiceProject_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SERVICEPROJECT_LINK);
- hLinkServiceProject_.addHyperlinkListener(new IHyperlinkListener(){
- public void linkActivated(HyperlinkEvent e){
- launchProjectDialog();
- }
- public void linkEntered(HyperlinkEvent e){}
- public void linkExited(HyperlinkEvent e){}
- });
-
- hLinkServiceEAR_= new Hyperlink(hCompService_, SWT.NULL);
- utils_.createInfoPop(hLinkServiceRuntime_, INFOPOP_WSWSCEN_HYPERLINK_PROJECTS);
- hLinkServiceEAR_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SERVICEPROJECT_LINK);
- hLinkServiceEAR_.addHyperlinkListener(new IHyperlinkListener(){
- public void linkActivated(HyperlinkEvent e){
- launchProjectDialog();
- }
- public void linkEntered(HyperlinkEvent e){}
- public void linkExited(HyperlinkEvent e){}
- });
-
- hLinkServiceServer_.setText(SERVICE_SERVER_PREFIX);
- hLinkServiceRuntime_.setText(SERVICE_RUNTIME_PREFIX);
- hLinkServiceProject_.setText(SERVICE_PROJECT_PREFIX);
- hLinkServiceEAR_.setText(SERVICE_EAR_PREFIX);
-
- HyperlinkGroup serverRuntimeGroup = new HyperlinkGroup(Display.getCurrent());
-
- serverRuntimeGroup.add(hLinkServiceServer_);
- serverRuntimeGroup.add(hLinkServiceRuntime_);
- serverRuntimeGroup.add(hLinkServiceProject_);
- serverRuntimeGroup.add(hLinkServiceEAR_);
- serverRuntimeGroup.setHyperlinkUnderlineMode(HyperlinkSettings.UNDERLINE_ALWAYS);
-
- utils_.createHorizontalSeparator(parent, 1);
-
- // Add client widgets...
- clientWidget_ = new WebServiceClientTypeWidget(false);
- clientWidget_.addControls(parent, statusListener );
- clientWidget_.setPackable(this);
- clientWidget_.enableClientSlider(serviceScale_.getSelection()<=ScenarioContext.WS_START);
-
- // Advanced buttons section
- utils_.createHorizontalSeparator(parent, 3);
-
- Composite advancedButtonPanel = utils_.createComposite(parent, 1);
-
- publishButton_ = utils_.createCheckbox(advancedButtonPanel,
- ConsumptionUIMessages.BUTTON_WSWSCEN_PUBLISH, ConsumptionUIMessages.TOOLTIP_PWPR_CHECKBOX_LAUNCH_WS, INFOPOP_WSWSCEN_CHECKBOX_LAUNCH_WS);
- monitorButton_ = utils_.createCheckbox(advancedButtonPanel,
- ConsumptionUIMessages.CHECKBOX_MONITOR_WEBSERVICE, ConsumptionUIMessages.TOOLTIP_PWPR_CHECKBOX_MONITOR_SERVICE, INFOPOP_WSWSCEN_CHECKBOX_MONITOR_SERVICE);
-
- if (displayPreferences_ && getResourceContext().isOverwriteFilesEnabled()) {
- utils_.createHorizontalSeparator(parent, 1);
- Composite prefButtonPanel = utils_.createComposite(parent, 1);
- overwriteButton_ = utils_.createCheckbox(prefButtonPanel,
- ConsumptionUIMessages.CHECKBOX_OVERWRITE_FILES, ConsumptionUIMessages.TOOLTIP_WSWSCEN_BUTTON_OVERWRITE_FILES, INFOPOP_WSWSCEN_CHECKBOX_OVERWRITE);
- overwriteButton_.setSelection(getResourceContext()
- .isOverwriteFilesEnabled());
- overwriteButton_.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- getResourceContext().setOverwriteFilesEnabled(overwriteButton_.getSelection());
- }
- });
- }
-
- return this;
- }
-
- private void launchProjectDialog()
- {
- String currentProjectName = getServiceProjectName();
- String currentEarProjectName = getServiceEarProjectName();
- String currentProjectType = getServiceComponentType();
- boolean currentNeedEar = getServiceNeedEAR();
-
- projectDialog_.setProjectName(currentProjectName);
- projectDialog_.setEarProjectName(currentEarProjectName);
- projectDialog_.setProjectComponentType(currentProjectType);
- projectDialog_.setNeedEAR(currentNeedEar);
-
- int status = projectDialog_.open();
- if (status == Window.OK)
- {
- String newProjectName = projectDialog_.getProjectName();
- String newEarProjectName = projectDialog_.getEarProjectName();
- String newProjectType = projectDialog_.getProjectComponentType();
- boolean newNeedEar = projectDialog_.getNeedEAR();
-
- //Update project settings and validate page if selections changed.
- if (!newProjectName.equals(currentProjectName)
- || !newEarProjectName.equals(currentEarProjectName)
- || !newProjectType.equals(currentProjectType)
- || newNeedEar != currentNeedEar) {
- setServiceProjectName(newProjectName);
- setServiceEarProjectName(newEarProjectName);
- setServiceComponentType(newProjectType);
- setServiceNeedEAR(newNeedEar);
- validationState_ = (new ValidationUtils()).getNewValidationState(validationState_, ValidationUtils.VALIDATE_PROJECT_CHANGES);
- statusListener_.handleEvent(null);
- }
-
- /*check to see if text has changed for project and EAR
- if so, repaint links */
- if (!newProjectName.equals(currentProjectName))
- {
- hLinkServiceProject_.pack(true);
- packSelf();
- }
- if (!newEarProjectName.equals(currentEarProjectName))
- {
- hLinkServiceEAR_.pack(true);
- packSelf();
- }
- }
- }
-
- private void launchRuntimeSelectionDialog(boolean clientContext)
- {
- launchRuntimeSelectionDialog(clientContext, false);
- }
-
- private void launchRuntimeSelectionDialog(boolean clientContext, boolean selectServerFirst)
- {
- byte mode = clientContext ? (byte)1 : (byte)0;
-
- //TODO: jvh - investigate - don't think j2ee version shouldn't be hard coded (last parm)
- // question - where to pick it up from?
- //Remember the current values
- TypeRuntimeServer currentServiceTRS = getServiceTypeRuntimeServer();
- IWorkbench workbench = PlatformUI.getWorkbench();
- RuntimeServerSelectionDialog rssd = new RuntimeServerSelectionDialog(
- workbench.getActiveWorkbenchWindow().getShell(), mode, currentServiceTRS, "14");
- rssd.setSelectServerFirst(selectServerFirst);
- int result = rssd.open();
- if (result == Window.OK)
- {
- TypeRuntimeServer newServiceTRS = rssd.getTypeRuntimeServer();
- if (!currentServiceTRS.equals(newServiceTRS))
- {
- setServiceTypeRuntimeServer(newServiceTRS);
- refreshClientServerRuntimeSelection();
- validationState_ = (new ValidationUtils()).getNewValidationState(validationState_, ValidationUtils.VALIDATE_SERVER_RUNTIME_CHANGES);
- clientWidget_.setValidationState(ValidationUtils.VALIDATE_SERVER_RUNTIME_CHANGES);
- statusListener_.handleEvent(null); //Revalidate the page since server/runtime selections changed.
- }
-
- }
- }
-
- public void setClientTypeRuntimeServer(TypeRuntimeServer ids) {
- clientWidget_.setTypeRuntimeServer( ids );
- }
-
- public TypeRuntimeServer getClientTypeRuntimeServer() {
- return clientWidget_.getTypeRuntimeServer();
- }
-
- public void setInstallClient(Boolean install) {
- clientWidget_.setInstallClient( install );
- }
-
- public Boolean getInstallClient() {
- return clientWidget_.getInstallClient();
- }
-
- public void setStartClient(Boolean startClient) {
- clientWidget_.setStartClient( startClient );
- }
-
- public Boolean getStartClient() {
- return clientWidget_.getStartClient();
- }
-
- public void setTestClient(Boolean testClient) {
- clientWidget_.setTestClient( testClient );
- }
-
- public Boolean getTestClient() {
- return clientWidget_.getTestClient();
- }
-
- public void setDevelopClient(boolean develop) {
- clientWidget_.setDevelopClient( develop );
- }
-
- public boolean getDevelopClient() {
- return clientWidget_.getDevelopClient();
- }
-
- public void setAssembleClient(boolean assemble) {
- clientWidget_.setAssembleClient( assemble );
- }
-
- public boolean getAssembleClient() {
- return clientWidget_.getAssembleClient();
- }
-
- public void setDeployClient(boolean deploy) {
- clientWidget_.setDeployClient( deploy );
- }
-
- public boolean getDeployClient() {
- return clientWidget_.getDeployClient();
- }
-
-private void handleTypeChange()
- {
- if (!preferencesPage_) {
- int scenario = getWebServiceScenario();
-
- if (scenario == WebServiceScenario.BOTTOMUP)
- {
- serviceLabel_.setText(ConsumptionUIMessages.LABEL_WEBSERVICEIMPL);
- }
- else if (scenario == WebServiceScenario.TOPDOWN)
- {
- serviceLabel_.setText(ConsumptionUIMessages.LABEL_WEBSERVICEDEF);
- }
- }
- }
-
- public void setServiceTypeRuntimeServer(TypeRuntimeServer ids) {
- LabelsAndIds labelIds = WebServiceRuntimeExtensionUtils2
- .getServiceTypeLabels();
- // rskreg
- int selection = 0;
- String[] serviceIds = labelIds.getIds_();
- String selectedId = ids.getTypeId();
-
- webserviceType_.setItems(labelIds.getLabels_());
-
- // Now find the selected one.
- for (int index = 0; index < serviceIds.length; index++) {
- if (selectedId.equals(serviceIds[index])) {
- selection = index;
- break;
- }
- }
- webserviceType_.select(selection);
-
- ids_ = ids;
-
- if (ids_ != null)
- {
- String serviceServerText = "";
- String serverId = ids_.getServerId();
- if (serverId != null && serverId.length()>0)
- {
- serviceServerText = WebServiceRuntimeExtensionUtils2.getServerLabelById(serverId);
- }
- String serviceRuntimeText = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(ids_.getRuntimeId());
-
- String currentServerText = hLinkServiceServer_.getText();
- String currentRuntimeText = hLinkServiceRuntime_.getText();
- String newServerText = SERVICE_SERVER_PREFIX + " " + serviceServerText;
- String newRuntimeText = SERVICE_RUNTIME_PREFIX + " " + serviceRuntimeText;
- hLinkServiceServer_.setText(newServerText);
- hLinkServiceRuntime_.setText(newRuntimeText);
-
- /*check to see if text has changed for server or runtime
- if so, repaint links */
- if (!newServerText.equals(currentServerText))
- {
- hLinkServiceServer_.pack(true);
- packSelf();
- }
-
- if (!newRuntimeText.equals(currentRuntimeText))
- {
- hLinkServiceRuntime_.pack(true);
- packSelf();
- }
- }
- labelIds_ = labelIds;
- handleTypeChange();
-
- if (projectDialog_ != null)
- projectDialog_.setTypeRuntimeServer(ids_);
-
-
- //When the server changes, the state of needEar could change.
- //If the the server change results in a change in the state of needEar,
- //update needEar and serviceEarProjectName.
- ValidationUtils vu = new ValidationUtils();
- boolean oldNeedEar = getServiceNeedEAR();
- boolean serviceProjectOrProjectTypeNeedsEar;
-
- if (!oldNeedEar)
- {
- //If an EAR was not needed previously it could have been because of the project/project type or the server.
- //If it was because of the project/project type, changing the server should have no impact
- //on the state of needEar.
- serviceProjectOrProjectTypeNeedsEar = vu.projectOrProjectTypeNeedsEar(getServiceProjectName(), getServiceComponentType());
- }
- else
- {
- serviceProjectOrProjectTypeNeedsEar = true;
- }
-
- //boolean serviceProjectOrProjectTypeNeedsEar = vu.projectOrProjectTypeNeedsEar(getServiceProjectName(), getServiceComponentType());
- if (serviceProjectOrProjectTypeNeedsEar)
- {
- //Could not rule out need for an Ear from the project/project type so changing the server
- //may impact the need for an Ear.
-
- boolean currentServiceServerNeedsEar = vu.serverNeedsEAR(getServiceTypeRuntimeServer().getServerId());
- if (oldNeedEar != currentServiceServerNeedsEar)
- {
- //Update needEar and serviceEarProjectName.
- if (currentServiceServerNeedsEar)
- {
- //Calculate a reasonable default for the Ear project name
- String earProjectName = DefaultingUtils.getDefaultEARProjectName(getServiceProjectName());
- setServiceNeedEAR(currentServiceServerNeedsEar);
- setServiceEarProjectName(earProjectName);
- }
- else
- {
- setServiceNeedEAR(currentServiceServerNeedsEar);
- setServiceEarProjectName("");
- }
-
- }
- }
- }
-
- public TypeRuntimeServer getServiceTypeRuntimeServer() {
- return ids_;
- }
-
- public void setServiceGeneration(int value)
- {
- serviceScale_.setSelection(value);
- setGraphics(value);
-
- //enable client widget based on service scale setting
- clientWidget_.enableClientSlider(value<=ScenarioContext.WS_START);
-
- /*for popup case need to make sure that the UI is refreshed based on
- changes to data*/
- packSelf();
- }
-
- public int getServiceGeneration()
- {
- return serviceScale_.getSelection();
- }
-
- public boolean getDevelopService() {
- return developService_;
- }
-
- public void setDevelopService(boolean developService) {
- this.developService_ = developService;
- }
-
- public boolean getAssembleService() {
- return assembleService_;
- }
-
- public void setAssembleService(boolean assembleService) {
- this.assembleService_ = assembleService;
- }
-
- public boolean getDeployService() {
- return deployService_;
- }
-
- public void setDeployService(boolean deployService) {
- this.deployService_ = deployService;
- }
-
- public Boolean getStartService(){
- return startService_;
- }
-
- public void setStartService(Boolean value) {
- startService_=value;
- }
-
- public Boolean getInstallService() {
- return installService_;
- }
-
- public void setInstallService(Boolean value) {
- installService_=value;
- }
-
- public Boolean getTestService() {
- return
- new Boolean( testService_.booleanValue() || clientWidget_.getTestClient().booleanValue());
- }
-
- public void setTestService(Boolean value) {
- testService_= value;
- }
- public Boolean getMonitorService() {
- return new Boolean(monitorButton_.getSelection());
- }
-
- public void setMonitorService(Boolean value) {
- monitorButton_.setSelection(value.booleanValue());
- }
-
- public Boolean getPublishService() {
- return new Boolean(publishButton_.getSelection());
- }
-
- public void setPublishService(Boolean value) {
- publishButton_.setSelection( value.booleanValue() );
- }
-
- public Boolean getGenerateProxy() {
- return new Boolean(clientWidget_.getGenerateProxy());
- }
-
- public void setClientGeneration(int value)
- {
- clientWidget_.setClientGeneration(value);
- /*for popup case need to make sure that the UI is refreshed based on
- changes to data*/
- packSelf();
- }
-
- public String getClientEarProjectName()
- {
- return clientWidget_.getClientEarProjectName();
- }
-
- public String getClientProjectName()
- {
- return clientWidget_.getClientProjectName();
- }
-
- public int getClientGeneration()
- {
- return clientWidget_.getClientGeneration();
- }
-
- public ResourceContext getResourceContext() {
- if (resourceContext_ == null) {
- resourceContext_ = WebServicePlugin.getInstance()
- .getResourceContext();
- }
- return resourceContext_;
- }
-
- public void setResourceContext(ResourceContext context) {
- resourceContext_ = context;
- }
-
- public IStructuredSelection getObjectSelection()
- {
- return objectSelection_;
- }
-
- public void setObjectSelection(IStructuredSelection selection )
- {
- objectSelection_ = selection;
- }
-
- public WebServicesParser getWebServicesParser()
- {
- return parser_;
- }
-
- public void setWebServicesParser(WebServicesParser parser)
- {
- parser_ = parser;
- clientWidget_.setWebServicesParser(parser);
- }
- public void externalize() {
- super.externalize();
- if (!preferencesPage_) {
- String webServiceTypeID= null;
- if (ids_ != null)
- webServiceTypeID = ids_.getTypeId();
- serviceImpl_.storeWidgetHistory(webServiceTypeID);
- }
- }
-
- public void internalize() {
-
- if (preferencesPage_)
- return;
-
- if (objectSelectionWidget_ == null)
- objectSelectionWidget_ = getSelectionWidget();
-
- String displayable = null;
-
- if (objectSelectionWidget_ instanceof IObjectSelectionLaunchable) {
- IObjectSelectionLaunchable launchable = (IObjectSelectionLaunchable) objectSelectionWidget_;
- launchable.setInitialSelection(objectSelection_);
- objectSelection_ = launchable.getObjectSelection();
- displayable = launchable.getObjectSelectionDisplayableString();
- }
- else {
- IObjectSelectionWidget selectionWidget = (IObjectSelectionWidget) objectSelectionWidget_;
- selectionWidget.setInitialSelection(objectSelection_);
- displayable = selectionWidget.getObjectSelectionDisplayableString();
- }
-
- serviceImpl_.removeModifyListener(objectModifyListener_);
- if (displayable != null && displayable.length() != 0)
- serviceImpl_.setText(displayable);
- String webServiceTypeID = null;
- if (ids_ != null)
- webServiceTypeID = ids_.getTypeId();
- serviceImpl_.restoreWidgetHistory(webServiceTypeID);
- serviceImpl_.addModifyListener(objectModifyListener_);
-
-
- }
-
- public IStatus getStatus() {
- IStatus status = Status.OK_STATUS;
-
- IStatus missingFieldStatus = checkMissingFieldStatus();
- if (missingFieldStatus.getSeverity() == IStatus.ERROR) {
- return missingFieldStatus;
- }
-
- IStatus serviceImplValidationStatus = checkServiceImplTextStatus();
- if (serviceImplValidationStatus.getSeverity() == IStatus.ERROR) {
- return serviceImplValidationStatus;
- }
- else if (serviceImplValidationStatus.getSeverity() == IStatus.WARNING){
- return serviceImplValidationStatus;
- }
-
- IStatus possibleErrorStatus = checkErrorStatus();
- if (possibleErrorStatus.getSeverity() == IStatus.ERROR || possibleErrorStatus.getSeverity() == IStatus.WARNING) {
- return possibleErrorStatus;
- }
-
- IStatus possibleWarningStatus = checkWarningStatus();
- if (possibleWarningStatus.getSeverity() == IStatus.WARNING) {
- return possibleWarningStatus;
- }
-
- // If no warnings/errors were reported, clear validation state on
- // service side and client side (if enabled)
- validationState_ = ValidationUtils.VALIDATE_NONE;
- if (clientWidget_.getGenerateProxy()) {
- clientWidget_.setValidationState(ValidationUtils.VALIDATE_NONE);
- }
-
- return status;
- }
-
- /*
- * call validation code in the object selection widget to ensure any
- * modifications to the serviceImpl_ field are valid
- */
- private IStatus checkServiceImplTextStatus() {
-
- String fieldText = serviceImpl_.getText().trim();
-
- if (objectSelectionWidget_ == null)
- {
- objectSelectionWidget_ = getSelectionWidget();
- }
-
- IObjectSelectionLaunchable launchable = null;
- if (objectSelectionWidget_ instanceof IObjectSelectionLaunchable)
- {
- launchable = (IObjectSelectionLaunchable)objectSelectionWidget_;
- validObjectSelection_ = launchable.validate(fieldText);
- }
- else
- {
- IObjectSelectionWidget widget = (IObjectSelectionWidget)objectSelectionWidget_;
- validObjectSelection_ = widget.validate(fieldText);
- }
-
- if (!validObjectSelection_)
- {
- int scenario = getWebServiceScenario();
-
- if (scenario == WebServiceScenario.BOTTOMUP){
- if (launchable != null){
- IStatus valStatus = launchable.validateSelection(new StructuredSelection(fieldText));
- if (valStatus.getSeverity() == IStatus.WARNING)
- return StatusUtils.warningStatus(ConsumptionUIMessages.MSG_WARN_SERVICE_IMPL_NAMING_CONVENTION);
- }
- else
- return StatusUtils.errorStatus(ConsumptionUIMessages.MSG_INVALID_SERVICE_IMPL);
- }
- else
- return StatusUtils.errorStatus(ConsumptionUIMessages.MSG_INVALID_SERVICE_DEF);
- }
-
- return Status.OK_STATUS;
- }
-
- private int getWebServiceScenario()
- {
- int index = webserviceType_.getSelectionIndex();
- String typeId = labelIds_.getIds_()[index];
- return WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(typeId);
- }
-
- private IStatus checkMissingFieldStatus() {
-
- // 1. Check for missing fields on service side
- ValidationUtils valUtils = new ValidationUtils();
- String serviceImpl = serviceImpl_.getText().trim();
- String typeId = getServiceTypeRuntimeServer().getTypeId();
- String runtimeId = getServiceTypeRuntimeServer().getRuntimeId();
- String serverId = getServiceTypeRuntimeServer().getServerId();
- String projectName = getServiceProjectName();
- boolean needEar = getServiceNeedEAR();
- String earProjectName = getServiceEarProjectName();
- String projectTypeId = getServiceComponentType();
-
- IStatus serviceMissingFieldStatus = valUtils.checkMissingFieldStatus(validationState_, typeId, serviceImpl,
- runtimeId, serverId, projectName, needEar, earProjectName, projectTypeId, false);
- if (serviceMissingFieldStatus.getSeverity() == IStatus.ERROR) {
- return serviceMissingFieldStatus;
- }
-
- // 2. Check for missing fields on the client side if it's visible.
- if (clientWidget_.getGenerateProxy()) {
- IStatus clientMissingFieldsStatus = clientWidget_.checkMissingFieldStatus();
- if (clientMissingFieldsStatus.getSeverity() == IStatus.ERROR) {
- return clientMissingFieldsStatus;
- }
-
- }
-
- return Status.OK_STATUS;
- }
-
- private IStatus checkErrorStatus() {
-
- ValidationUtils valUtils = new ValidationUtils();
-
- // 1. Check for errors on service side
- String projectName = getServiceProjectName();
- boolean needEar = getServiceNeedEAR();
- String earProjectName = getServiceEarProjectName();
- String projectTypeId = getServiceComponentType();
- String initialProjectName = "";
- if (initialProject_ != null) {
- initialProjectName = initialProject_.getName();
- }
- IStatus serviceSideErrorStatus = valUtils.checkErrorStatus(validationState_, getServiceTypeRuntimeServer(), projectName, initialProjectName, needEar, earProjectName, projectTypeId, false);
- if (serviceSideErrorStatus.getSeverity() == IStatus.ERROR) {
- return serviceSideErrorStatus;
- }
-
- // 2. Check for errors on client side if it is visible
- if (clientWidget_.getGenerateProxy()) {
- IStatus clientSideErrorStatus = clientWidget_.checkErrorStatus();
- if (clientSideErrorStatus.getSeverity() == IStatus.ERROR) {
- return clientSideErrorStatus;
- }
-
- // 3. Check for errors that span service and client if client side
- // is visible.
- int clientValidationState = clientWidget_.getValidationState();
- if (validationState_ == ValidationUtils.VALIDATE_ALL
- || validationState_ == ValidationUtils.VALIDATE_PROJECT_CHANGES
- || clientValidationState == ValidationUtils.VALIDATE_ALL
- || clientValidationState == ValidationUtils.VALIDATE_PROJECT_CHANGES) {
- IWebServiceRuntimeChecker runtimeChecker = null;
-
- String serviceRuntimeId = WebServiceRuntimeExtensionUtils2.getServiceRuntimeId(getServiceTypeRuntimeServer(), projectName, projectTypeId);
- runtimeChecker = WebServiceRuntimeExtensionUtils2.getServiceRuntimeChecker(serviceRuntimeId);
-
- if (runtimeChecker != null) {
- return runtimeChecker.checkServiceClientCompatibility(
- getServiceNeedEAR(), getServiceEarProjectName(), getServiceProjectName(),
- clientWidget_.getClientNeedEAR(), clientWidget_.getClientEarProjectName(),
- clientWidget_.getClientProjectName());
- }
- }
- }
-
- return Status.OK_STATUS;
- }
-
- private IStatus checkWarningStatus() {
- ValidationUtils valUtils = new ValidationUtils();
- // 1. Check for warnings on the service side
- int scaleSetting = getServiceGeneration();
- String serverId = getServiceTypeRuntimeServer().getServerId();
- IStatus serviceWarningStatus = valUtils.checkWarningStatus(validationState_, scaleSetting, serverId, getServiceTypeRuntimeServer().getServerInstanceId(), false, getServiceProjectName(), initialProject_, getServiceTypeRuntimeServer().getTypeId());
- if (serviceWarningStatus.getSeverity() == IStatus.WARNING) {
- return serviceWarningStatus;
- }
-
- // 2. Check for warnings on the client side if it's enabled
- if (clientWidget_.getGenerateProxy()) {
- IStatus clientWarningStatus = clientWidget_.checkWarningStatus();
- if (clientWarningStatus.getSeverity() == IStatus.WARNING) {
- return clientWarningStatus;
- }
-
- }
-
- return Status.OK_STATUS;
- }
-
- protected void initImageRegistry()
- {
- imageReg_ = new ImageRegistry(Display.getCurrent());
-
- imageReg_.put(ICON_SCALE_BG_0, WebServiceConsumptionUIPlugin
- .getImageDescriptor(ICON_SCALE_BG_0));
- imageReg_.put(ICON_SCALE_BG_1, WebServiceConsumptionUIPlugin
- .getImageDescriptor(ICON_SCALE_BG_1));
- imageReg_.put(ICON_SCALE_BG_2, WebServiceConsumptionUIPlugin
- .getImageDescriptor(ICON_SCALE_BG_2));
- imageReg_.put(ICON_SCALE_BG_3, WebServiceConsumptionUIPlugin
- .getImageDescriptor(ICON_SCALE_BG_3));
- imageReg_.put(ICON_SCALE_BG_4, WebServiceConsumptionUIPlugin
- .getImageDescriptor(ICON_SCALE_BG_4));
- imageReg_.put(ICON_SCALE_BG_5, WebServiceConsumptionUIPlugin
- .getImageDescriptor(ICON_SCALE_BG_5));
- imageReg_.put(ICON_SCALE_BG_6, WebServiceConsumptionUIPlugin
- .getImageDescriptor(ICON_SCALE_BG_6));
-
- imageReg_.put(GRAPHIC_SERVICE_0, WebServiceCreationUIPlugin
- .getImageDescriptor(GRAPHIC_SERVICE_0));
- imageReg_.put(GRAPHIC_SERVICE_1, WebServiceCreationUIPlugin
- .getImageDescriptor(GRAPHIC_SERVICE_1));
- imageReg_.put(GRAPHIC_SERVICE_2, WebServiceCreationUIPlugin
- .getImageDescriptor(GRAPHIC_SERVICE_2));
- imageReg_.put(GRAPHIC_SERVICE_3, WebServiceCreationUIPlugin
- .getImageDescriptor(GRAPHIC_SERVICE_3));
- imageReg_.put(GRAPHIC_SERVICE_4, WebServiceCreationUIPlugin
- .getImageDescriptor(GRAPHIC_SERVICE_4));
- imageReg_.put(GRAPHIC_SERVICE_5, WebServiceCreationUIPlugin
- .getImageDescriptor(GRAPHIC_SERVICE_5));
- }
-
- private void setAdvancedOptions(boolean enabled)
- {
- monitorButton_.setEnabled(enabled);
- publishButton_.setEnabled(enabled);
- }
-
- public void setServiceProjectName(String name)
- {
- serviceProjectName_= name;
- hLinkServiceProject_.setText(SERVICE_PROJECT_PREFIX + " " + serviceProjectName_);
- hLinkServiceProject_.pack(true);
- packSelf();
- }
-
- public void setInitialProject(IProject project)
- {
- initialProject_ = project;
- }
-
- public void setServiceEarProjectName(String name)
- {
- serviceEarProjectName_ = name;
- refreshEARLink();
- }
-
- public void refreshEARLink()
- {
- hLinkServiceEAR_.setVisible(needEar_);
- if (needEar_)
- {
- hLinkServiceEAR_.setText(SERVICE_EAR_PREFIX + " " + serviceEarProjectName_);
- hLinkServiceEAR_.pack(true);
- packSelf();
- }
- }
- public void setServiceComponentType( String type )
- {
- serviceComponentType_ = type;
- }
-
- public void setClientProjectName(String name)
- {
- clientWidget_.setClientProjectName(name);
- }
-
- public void setClientEarProjectName(String name)
- {
- clientWidget_.setClientEarProjectName(name);
- }
-
- IProject project_;
-
- public String getServiceComponentType()
- {
- return serviceComponentType_;
- }
-
- public void setClientComponentType(String type)
- {
- clientWidget_.setClientComponentType(type);
- }
-
- public String getClientComponentType()
- {
- return clientWidget_.getClientComponentType();
- }
-
- public String getServiceProjectName()
- {
- return serviceProjectName_;
- }
-
- public String getServiceEarProjectName()
- {
- return serviceEarProjectName_;
- }
-
- public void setClientProject(IProject project)
- {
- clientWidget_.setProject(project);
- }
-
- private IProject getClientProject()
- {
- return clientWidget_.getProject();
- }
-
- public void setProject(IProject project)
- {
- project_ = project;
- }
-
- public IProject getProject()
- {
- return project_;
- }
-
- public String getServiceRuntimeId()
- {
- // calculate the most appropriate serviceRuntimeId based on current settings.
- return WebServiceRuntimeExtensionUtils2.getServiceRuntimeId(getServiceTypeRuntimeServer(), getServiceProjectName(), getServiceComponentType());
- }
-
- public String getClientRuntimeId()
- {
- return clientWidget_.getClientRuntimeId();
- }
-
- public void setServiceNeedEAR(boolean b)
- {
- needEar_ = b;
- refreshEARLink();
- }
-
- public boolean getServiceNeedEAR()
- {
- return needEar_;
- }
-
- public void setClientNeedEAR(boolean b)
- {
- clientWidget_.setClientNeedEAR(b);
- }
-
- public boolean getClientNeedEAR()
- {
- return clientWidget_.getClientNeedEAR();
- }
-
- // looks through extensions and returns the appropriate selection widget
- private Object getSelectionWidget()
- {
- String wst = getServiceTypeRuntimeServer().getTypeId();
- int scenario = WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(wst);
- String implId = WebServiceRuntimeExtensionUtils2.getWebServiceImplIdFromTypeId(wst);
- WebServiceImpl wsimpl = WebServiceRuntimeExtensionUtils2.getWebServiceImplById(implId);
- Object result = null;
-
-
- if (wsimpl != null)
- {
- String objectSelectionWidgetId = null;
- if (scenario == WebServiceScenario.TOPDOWN)
- {
- objectSelectionWidgetId = "org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget";
- }
- else
- {
- objectSelectionWidgetId = wsimpl.getObjectSelectionWidget();
- }
-
- ObjectSelectionRegistry registry = ObjectSelectionRegistry.getInstance();
- boolean editable = registry.getExternalModify( objectSelectionWidgetId );
-
- serviceImpl_.setEnabled( editable );
- result = registry.getSelectionWidget( objectSelectionWidgetId );
- }
-
- return result;
- }
-
- // for the purposes of disabling the service implementation controls from the preferences dialog
- public void disableNonPreferenceWidgets()
- {
- if (serviceImpl_ != null)
- serviceImpl_.setEnabled(false);
- if (browseButton_ != null)
- browseButton_.setEnabled(false);
- if (hCompService_ != null)
- {
- hCompService_.setVisible(false);
- }
- clientWidget_.disableNonPreferenceWidgets();
- }
-
- private void setGraphics(int value)
- {
- String iconImage = "";
- String toplogyImage = "";
- switch (value) {
- case 0:
- iconImage=ICON_SCALE_BG_0;
- toplogyImage=GRAPHIC_SERVICE_0;
- break;
- case 1:
- iconImage=ICON_SCALE_BG_1;
- toplogyImage=GRAPHIC_SERVICE_1;
- break;
- case 2:
- iconImage=ICON_SCALE_BG_2;
- toplogyImage=GRAPHIC_SERVICE_2;
- break;
- case 3:
- iconImage=ICON_SCALE_BG_3;
- toplogyImage=GRAPHIC_SERVICE_3;
- break;
- case 4:
- iconImage=ICON_SCALE_BG_4;
- toplogyImage=GRAPHIC_SERVICE_4;
- break;
- case 5:
- case 6:
- iconImage=ICON_SCALE_BG_5;
- toplogyImage=GRAPHIC_SERVICE_5;
- break;
- default:
- break;
- }
- serviceScale_.setBackgroundImage(imageReg_.get(iconImage));
- topologySpot_.setImage(imageReg_.get(toplogyImage));
- }
-
- private void refreshServerRuntimeSelection()
- {
- //new up ServerRuntimeSelectionWidgetDefaultingCommand
- ServerRuntimeSelectionWidgetDefaultingCommand serverRTDefaultCmd = new ServerRuntimeSelectionWidgetDefaultingCommand();
-
- //call setters of new defaulting command:
- serverRTDefaultCmd.setInitialSelection(getObjectSelection());
- serverRTDefaultCmd.setInitialProject(getProject());
- serverRTDefaultCmd.setGenerateProxy(clientWidget_.getGenerateProxy());
- serverRTDefaultCmd.setServiceTypeRuntimeServer(getServiceTypeRuntimeServer());
- serverRTDefaultCmd.setWebServicesParser(getWebServicesParser());
- serverRTDefaultCmd.setClientInitialSelection(getObjectSelection());
- serverRTDefaultCmd.setClientInitialProject(getClientProject());
- serverRTDefaultCmd.setClientEarProjectName(clientWidget_.getClientEarProjectName());
- serverRTDefaultCmd.setClientTypeRuntimeServer(getClientTypeRuntimeServer());
-
- serverRTDefaultCmd.execute(null, null);
-
- //perform mappings from the defaulting command to the project settings...
- setServiceProjectName(serverRTDefaultCmd.getServiceProjectName());
- setServiceEarProjectName(serverRTDefaultCmd.getServiceEarProjectName());
- setServiceComponentType(serverRTDefaultCmd.getServiceComponentType());
- setClientProjectName(serverRTDefaultCmd.getClientProjectName());
- setClientEarProjectName(serverRTDefaultCmd.getClientEarProjectName());
- setServiceTypeRuntimeServer(serverRTDefaultCmd.getServiceTypeRuntimeServer());
- setClientTypeRuntimeServer(serverRTDefaultCmd.getClientTypeRuntimeServer());
- setServiceNeedEAR(serverRTDefaultCmd.getServiceNeedEAR());
- setClientNeedEAR(serverRTDefaultCmd.getClientNeedEAR());
- setClientComponentType(serverRTDefaultCmd.getClientComponentType());
- }
-
- /**
- * Update client server and runtime based on service side
- */
- private void refreshClientServerRuntimeSelection()
- {
- TypeRuntimeServer clientTypeRuntimeserver = getClientTypeRuntimeServer();
- clientTypeRuntimeserver.setRuntimeId(getServiceTypeRuntimeServer().getRuntimeId());
- clientTypeRuntimeserver.setServerId(getServiceTypeRuntimeServer().getServerId());
- clientTypeRuntimeserver.setServerInstanceId(getServiceTypeRuntimeServer().getServerInstanceId());
- setClientTypeRuntimeServer(clientTypeRuntimeserver);
- }
-
-
- private void callObjectTransformation(IStructuredSelection objectSelection,
- IProject project, String componentName, boolean refreshRuntime)
- {
- ObjectSelectionOutputCommand objOutputCommand = new ObjectSelectionOutputCommand();
- objOutputCommand.setTypeRuntimeServer(getServiceTypeRuntimeServer());
- objOutputCommand.setObjectSelection(objectSelection);
- objOutputCommand.setProject(project);
- objOutputCommand.setComponentName(componentName);
-
- objOutputCommand.execute(null, null);
-
- setWebServicesParser(objOutputCommand.getWebServicesParser());
- setObjectSelection(objOutputCommand.getObjectSelection());
- setProject(objOutputCommand.getProject());
-
- if (refreshRuntime || forceRefreshRuntime)
- refreshServerRuntimeSelection();
-
- forceRefreshRuntime = false;
- }
-
- private class ScaleSelectionListener implements SelectionListener
- {
- public void widgetSelected(SelectionEvent e) {
-
- Scale scale = (Scale)e.widget;
- int selection = scale.getSelection();
-
- //TODO: change the hard coded integers here to the the ScenarioContext.WS_xxx when in less critical phase
- switch (selection) {
- case 0:
- serviceScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_TEST);
- break;
- case 1:
- serviceScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_RUN);
- break;
- case 2:
- serviceScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_INSTALL);
- break;
- case 3:
- serviceScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_DEPLOY);
- break;
- case 4:
- serviceScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_ASSEMBLE);
- break;
- case 5:
- case 6:
- serviceScale_.setSelection(ScenarioContext.WS_DEVELOP); //"no selection" is not allowed...must develop service @ minimum
- serviceScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_DEVELOP);
- //reset local selection so that setters get correct value below
- selection = ScenarioContext.WS_DEVELOP;
- break;
- default:
- break;
- }
-
- setDevelopService(selection <= ScenarioContext.WS_DEVELOP);
- setAssembleService(selection <= ScenarioContext.WS_ASSEMBLE);
- setDeployService(selection <= ScenarioContext.WS_DEPLOY);
-
- setTestService(new Boolean(selection <= ScenarioContext.WS_TEST));
- setInstallService(new Boolean(selection <= ScenarioContext.WS_INSTALL));
- setStartService(new Boolean(selection <= ScenarioContext.WS_START));
- setAdvancedOptions(selection <= ScenarioContext.WS_INSTALL);
- clientWidget_.enableClientSlider(selection <= ScenarioContext.WS_START);
-
- setGraphics(selection);
-
- //Validate the page
- validationState_ = (new ValidationUtils()).getNewValidationState(validationState_, ValidationUtils.VALIDATE_SCALE_CHANGES);
- statusListener_.handleEvent(null);
-
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- widgetSelected(e);
- }
- }
-
- private class ServiceImplBrowseListener implements SelectionListener
- {
- public void widgetDefaultSelected(SelectionEvent e) {
- // TODO Auto-generated method stub
- }
-
- public void widgetSelected(SelectionEvent e) {
-
- if (objectSelectionWidget_ == null)
- objectSelectionWidget_ = getSelectionWidget();
-
- IStructuredSelection objectSelection = null;
- IProject project = null;
- String componentName="";
- int result=Dialog.CANCEL;
-
- // This should be the Web Service Wizard Dialog's shell, and should be non-null.
- Shell shell = Display.getCurrent().getActiveShell();
-
- if (objectSelectionWidget_ instanceof IObjectSelectionLaunchable)
- {
- IObjectSelectionLaunchable launchable = ((IObjectSelectionLaunchable)objectSelectionWidget_);
- launchable.setInitialSelection(getObjectSelection());
-
- // Bug 269097 - Use the Web Service's dialog shell, not the platform workbench's shell
- result = launchable.launch(shell);
- if (result == Dialog.OK)
- {
- serviceImpl_.removeModifyListener(objectModifyListener_);
- serviceImpl_.setText(launchable.getObjectSelectionDisplayableString());
- serviceImpl_.addModifyListener(objectModifyListener_);
- objectSelection = launchable.getObjectSelection();
- project = launchable.getProject();
- componentName= launchable.getComponentName();
- }
- }
- else
- {
- // bug 269097 - - Use the Web Service's dialog shell, not the platform workbench's shell.
- browseDialog_ = new ServiceImplSelectionDialog(shell,
- new PageInfo(ConsumptionUIMessages.DIALOG_TITILE_SERVICE_IMPL_SELECTION, "",
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new ObjectSelectionWidget();
- }
- }));
-
- browseDialog_.setTypeRuntimeServer(getServiceTypeRuntimeServer());
- browseDialog_.setInitialSelection(getObjectSelection());
- result = browseDialog_.open();
- if (result == Dialog.OK)
- {
- serviceImpl_.removeModifyListener(objectModifyListener_);
- serviceImpl_.setText(browseDialog_.getDisplayableSelectionString());
- serviceImpl_.addModifyListener(objectModifyListener_);
- objectSelection = browseDialog_.getObjectSelection();
- project = browseDialog_.getProject();
- componentName= browseDialog_.getComponentName();
- }
- browseDialog_ = null;
- }
-
- // call ObjectSelectionOutputCommand to carry out any transformation on the objectSelection
- if (result == Dialog.OK)
- {
- callObjectTransformation(objectSelection, project, componentName, getWebServiceScenario() != WebServiceScenario.TOPDOWN);
- validationState_ = ValidationUtils.VALIDATE_ALL;
- statusListener_.handleEvent(null); // validate the page
- }
- }
- }
-
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetDefaultingCommand.java
deleted file mode 100644
index 788b959..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060524 142635 gilberta@ca.ibm.com - Gilbert Andrews
- * 20060529 141422 kathy@ca.ibm.com - Kathy Chan
- * 20070327 172339 kathy@ca.ibm.com - Kathy Chan
- * 20080220 219537 makandre@ca.ibm.com - Andrew Mak
- * 20080523 233764 makandre@ca.ibm.com - Andrew Mak, Top down EJB preference not respected
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.ws.internal.ui.utils.AdapterUtils;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-public class ServerWizardWidgetDefaultingCommand extends ClientWizardWidgetDefaultingCommand
-{
- private TypeRuntimeServer typeRuntimeServer_;
- private IStructuredSelection initialSelection_;
- private int serviceGeneration_;
- private boolean developService_;
- private boolean assembleService_;
- private boolean deployService_;
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
-
- String type = getScenarioContext().getWebServiceType();
- String runtime = WebServiceRuntimeExtensionUtils2.getDefaultRuntimeValueFor( type );
-
- String factoryID = WebServiceRuntimeExtensionUtils2.getDefaultServerValueFor(type);
- typeRuntimeServer_ = new TypeRuntimeServer();
-
- typeRuntimeServer_.setTypeId( type );
- typeRuntimeServer_.setRuntimeId( runtime );
- typeRuntimeServer_.setServerId( factoryID );
-
- //Default the typeId from the initial selection
- String[] typeIds = WebServiceRuntimeExtensionUtils2.getWebServiceTypeBySelection(initialSelection_);
-
- if (typeIds!=null && typeIds.length>0)
- {
- String preferred = typeIds[0]; // default to first entry initially
- for (String typeId : typeIds) {
- if (typeId.equals(type)) {
- preferred = typeId;
- break;
- }
- }
- typeRuntimeServer_.setTypeId(preferred);
- } else {
- if (initialSelection_ != null && !initialSelection_.isEmpty())
- {
- Object initialObject = initialSelection_.getFirstElement();
- // initialObject would not be null since !initialSelection_.isEmpty()
- boolean hasAdapter = AdapterUtils.hasAdapter(initialObject);
- if (hasAdapter) {
- String entry = null;
- String prefix = WebServiceScenario.TOPDOWN + "/";
- if (type.startsWith(prefix))
- entry = type;
- else {
- StringBuffer entrybuff = new StringBuffer();
- entrybuff.append(prefix);
- entrybuff.append("org.eclipse.jst.ws.wsImpl.java");
- entry = entrybuff.toString();
- }
- typeRuntimeServer_.setTypeId(entry);
- }
- }
- }
-
- serviceGeneration_ = getScenarioContext().getGenerateWebService();
-
- developService_ = serviceGeneration_ <= ScenarioContext.WS_DEVELOP;
- assembleService_ = serviceGeneration_ <= ScenarioContext.WS_ASSEMBLE;
- deployService_ = serviceGeneration_ <= ScenarioContext.WS_DEPLOY;
-
- defaultClientScale();
-
- return Status.OK_STATUS;
- }
-
- public void setInitialSelection(IStructuredSelection selection)
- {
- initialSelection_ = selection;
- }
-
- public IStructuredSelection getInitialSelection()
- {
- return initialSelection_ ;
- }
-
- IProject project_;
-
- public IProject getInitialProject()
- {
- if (project_==null)
- {
- project_ = getProjectFromObjectSelection(initialSelection_);
- }
-
- return project_;
- }
-
- private IProject getProjectFromObjectSelection(IStructuredSelection selection)
- {
- if (selection != null && selection.size() == 1)
- {
- Object obj = selection.getFirstElement();
- if (obj != null)
- {
- try
- {
- IResource resource = ResourceUtils.getResourceFromSelection(obj);
- if (resource==null)
- return null;
- IProject p = ResourceUtils.getProjectOf(resource.getFullPath());
- return p;
- } catch(CoreException e)
- {
- return null;
- }
- }
- }
- return null;
- }
-
- public TypeRuntimeServer getServiceTypeRuntimeServer()
- {
- return typeRuntimeServer_;
- }
-
- public Boolean getInstallService()
- {
- return new Boolean( getScenarioContext().getInstallWebService() );
- }
-
- public Boolean getStartService()
- {
- return new Boolean( getScenarioContext().getStartWebService() );
- }
-
- public Boolean getTestService()
- {
- return new Boolean( getScenarioContext().getTestWebService() );
- }
-
- public Boolean getPublishService()
- {
- return new Boolean( getScenarioContext().getLaunchWebServiceExplorer() );
- }
-
- public Boolean getGenerateProxy()
- {
- return new Boolean( getScenarioContext().getGenerateProxy() );
- }
-
- public boolean getRunTestClient()
- {
- return getScenarioContext().isLaunchSampleEnabled();
- }
-
- public Boolean getMonitorService()
- {
- return new Boolean(getScenarioContext().getMonitorWebService());
- }
-
- public int getServiceGeneration()
- {
- return serviceGeneration_;
- }
-
- public int getClientGeneration()
- {
- return getScenarioContext().getGenerateClient();
- }
-
- public boolean getDevelopService() {
- return developService_;
- }
-
- public boolean getAssembleService() {
- return assembleService_;
- }
-
- public boolean getDeployService() {
- return deployService_;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetOutputCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetOutputCommand.java
deleted file mode 100644
index 6252ca6..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetOutputCommand.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060524 142635 gilberta@ca.ibm.com - Gilbert Andrews
- * 20060529 141422 kathy@ca.ibm.com - Kathy Chan
- * 20060727 144354 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetOutputCommand;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-
-
-public class ServerWizardWidgetOutputCommand extends ClientWizardWidgetOutputCommand
-{
- private TypeRuntimeServer typeRuntimeServer_;
- private boolean installService_;
- private boolean startService_;
- private boolean testService_;
- private boolean testClient_;
- private boolean runTestClient_;
- private boolean publishService_;
- private boolean generateProxy_;
- private boolean developService_;
- private boolean assembleService_;
- private boolean deployService_;
-
- private ResourceContext resourceContext_;
- private IStructuredSelection selection_;
-
-
- public TypeRuntimeServer getServiceTypeRuntimeServer()
- {
- return typeRuntimeServer_;
- }
-
- public boolean getInstallService()
- {
- return installService_;
- }
-
- public boolean getStartService()
- {
- return startService_;
- }
-
- public boolean getTestService()
- {
- return testService_;
- }
-
- public boolean getRunTestClient()
- {
- return runTestClient_;
- }
-
- public boolean getPublishService()
- {
- return publishService_;
- }
-
- public boolean getGenerateProxy()
- {
- return generateProxy_;
- }
-
- public ResourceContext getResourceContext()
- {
- return resourceContext_;
- }
-
- /**
- * @param generateProxy_ The generateProxy_ to set.
- */
- public void setGenerateProxy(boolean generateProxy_)
- {
- this.generateProxy_ = generateProxy_;
- }
- /**
- * @param publishService_ The publishService_ to set.
- */
- public void setPublishService(boolean publishService_)
- {
- this.publishService_ = publishService_;
- }
- /**
- * @param installService_ The installService_ to set.
- */
- public void setInstallService(boolean installService_)
- {
- this.installService_ = installService_;
- }
- /**
- * @param startService_ The startService_ to set.
- */
- public void setStartService(boolean startService_)
- {
- this.startService_ = startService_;
- }
- /**
- * @param testService_ The testService_ to set.
- */
- public void setTestService(boolean testService_)
- {
- this.testService_ = testService_;
- }
-
- /**
- * @param testService_ The testService_ to set.
- */
- public void setRunTestClient(boolean runTestClient_)
- {
- this.runTestClient_ = runTestClient_;
- }
-
- /**
- * @param typeRuntimeServer_ The typeRuntimeServer_ to set.
- */
- public void setServiceTypeRuntimeServer(TypeRuntimeServer typeRuntimeServer_)
- {
- this.typeRuntimeServer_ = typeRuntimeServer_;
- }
-
- public void setResourceContext(ResourceContext rc)
- {
- resourceContext_ = rc;
- }
-
- public void setObjectSelection(IStructuredSelection selection)
- {
- selection_ = selection;
- }
-
- public IStructuredSelection getObjectSelection()
- {
- return selection_;
- }
-
- public boolean getDevelopService() {
- return developService_;
- }
-
- public void setDevelopService(boolean developService) {
- this.developService_ = developService;
- }
-
- public boolean getAssembleService() {
- return assembleService_;
- }
-
- public void setAssembleService(boolean assembleService) {
- this.assembleService_ = assembleService;
- }
-
- public boolean getDeployService() {
- return deployService_;
- }
-
- public void setDeployService(boolean deployService) {
- this.deployService_ = deployService;
- }
-
- public boolean getTestClient() {
- return testClient_;
- }
-
- public void setTestClient(boolean testClient_) {
- this.testClient_ = testClient_;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServiceImplSelectionDialog.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServiceImplSelectionDialog.java
deleted file mode 100644
index fd210a0..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServiceImplSelectionDialog.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060410 135441 joan@ca.ibm.com - Joan Haggarty
- * 20060418 136335 joan@ca.ibm.com - Joan Haggarty
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.command.internal.env.ui.widgets.AbstractSelectionDialog;
-import org.eclipse.wst.command.internal.env.ui.widgets.PageInfo;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-public class ServiceImplSelectionDialog extends AbstractSelectionDialog {
-
- TypeRuntimeServer trs_;
- String titleText_;
- IStructuredSelection selection_;
-
- public ServiceImplSelectionDialog(Shell parent, PageInfo pageInfo) {
- super(parent, pageInfo);
- titleText_ = pageInfo.getPageName();
- }
-
- protected void callSetters()
- {
- ((ObjectSelectionWidget)getWidget()).setTypeRuntimeServer(trs_);
- ((ObjectSelectionWidget)getWidget()).setInitialSelection(selection_);
- }
-
- public void setTypeRuntimeServer(TypeRuntimeServer trs)
- {
- trs_ = trs;
-
- // set dialog title text based on the web service scenario
- if (trs != null)
- {
- String typeId = trs.getTypeId();
- int scenario = WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(typeId);
-
- if (scenario == WebServiceScenario.BOTTOMUP)
- {
- titleText_ = ConsumptionUIMessages.DIALOG_TITILE_SERVICE_IMPL_SELECTION;
- }
- else if (scenario == WebServiceScenario.TOPDOWN)
- {
- titleText_ = ConsumptionUIMessages.DIALOG_TITILE_SERVICE_DEF_SELECTION;
- }
- }
- }
-
- protected void setShellStyle(int newShellStyle)
- {
- super.setShellStyle( newShellStyle | SWT.RESIZE );
- }
-
- protected void configureShell(Shell newShell)
- {
- newShell.setText(titleText_);
- super.configureShell(newShell);
- }
-
- public String getDisplayableSelectionString() {
-
- return ((ObjectSelectionWidget)getWidget()).getObjectSelectionDisplayableString();
- }
-
- public IStructuredSelection getObjectSelection() {
- return ((ObjectSelectionWidget)getWidget()).getObjectSelection();
- }
-
- public IProject getProject(){
- return ((ObjectSelectionWidget)getWidget()).getProject();
- }
-
- public String getComponentName(){
- return ((ObjectSelectionWidget)getWidget()).getComponentName();
- }
-
- public void setInitialSelection(IStructuredSelection selection)
- {
- selection_ = selection;
- }
-
- protected Point getInitialSize()
- {
- return ((ObjectSelectionWidget)getWidget()).getWidgetSize();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ExportWSWidgetBinding.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ExportWSWidgetBinding.java
deleted file mode 100644
index d0067a5..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ExportWSWidgetBinding.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets.binding;
-
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishToPrivateUDDICommandFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishWSWidget;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand;
-
-
-public class ExportWSWidgetBinding implements CommandWidgetBinding
-{
- private CanFinishRegistry canFinishRegistry;
- private WidgetRegistry widgetRegistry;
- private DataMappingRegistry dataMappingRegistry;
- private PublishToPrivateUDDICommandFragment publishToPrivateUDDICmdFrag;
-
- public ExportWSWidgetBinding()
- {
- publishToPrivateUDDICmdFrag = new PublishToPrivateUDDICommandFragment();
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
- */
- public CommandFragmentFactory create()
- {
- return new CommandFragmentFactory()
- {
- public CommandFragment create()
- {
- SequenceFragment root = new SequenceFragment();
- root.add(new SimpleFragment("WSExport"));
- root.add(publishToPrivateUDDICmdFrag);
- root.add(new SimpleFragment(new WSExplorerLauncherCommand(), ""));
- return root;
- }
- };
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
- */
- public void registerCanFinish(CanFinishRegistry canFinishRegistry)
- {
- this.canFinishRegistry = canFinishRegistry;
- publishToPrivateUDDICmdFrag.registerCanFinish(this.canFinishRegistry);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- this.dataMappingRegistry = dataRegistry;
- publishToPrivateUDDICmdFrag.registerDataMappings(this.dataMappingRegistry);
-
- // PublishToPrivateUDDICommandFragment
- dataMappingRegistry.addMapping(PublishWSWidget.class, "PublishToPrivateUDDI", PublishToPrivateUDDICommandFragment.class);
-
- // LaunchWebServicesExplorerCommand
- dataMappingRegistry.addMapping(PublishWSWidget.class, "ForceLaunchOutsideIDE", WSExplorerLauncherCommand.class);
- dataMappingRegistry.addMapping(PublishWSWidget.class, "LaunchOptions", WSExplorerLauncherCommand.class);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
- */
- public void registerWidgetMappings(WidgetRegistry widgetRegistry)
- {
- this.widgetRegistry = widgetRegistry;
- publishToPrivateUDDICmdFrag.registerWidgetMappings(this.widgetRegistry);
-
- widgetRegistry.add("WSExport",
- ConsumptionUIMessages.PAGE_TITLE_WS_PUBLISH,
- ConsumptionUIMessages.PAGE_DESC_WS_PUBLISH,
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new PublishWSWidget(true);
- }
- }
- );
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/PublishWSDLWidgetBinding.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/PublishWSDLWidgetBinding.java
deleted file mode 100644
index 6d0f38e..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/PublishWSDLWidgetBinding.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets.binding;
-
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-
-
-public class PublishWSDLWidgetBinding implements CommandWidgetBinding
-{
- public PublishWSDLWidgetBinding()
- {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
- */
- public CommandFragmentFactory create()
- {
- return new CommandFragmentFactory()
- {
- public CommandFragment create()
- {
- return new SimpleFragment();
- }
- };
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
- */
- public void registerCanFinish(CanFinishRegistry canFinishRegistry)
- {
- }
-
- /* (non-Javadoc),
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
- */
- public void registerWidgetMappings(WidgetRegistry widgetRegistry)
- {
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java
deleted file mode 100644
index 20ae5d5..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java
+++ /dev/null
@@ -1,655 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060204 124408 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060204 121605 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060407 135415 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060410 135562 joan@ca.ibm.com - Joan Haggarty
- * 20060417 136391 joan@ca.ibm.com - Joan Haggarty
- * 20060425 138052 kathy@ca.ibm.com - Kathy Chan
- * 20060524 142635 gilberta@ca.ibm.com - Gilbert Andrews
- * 20060529 141422 kathy@ca.ibm.com - Kathy Chan
- * 20060530 144358 kathy@ca.ibm.com - Kathy Chan
- * 20060608 145529 kathy@ca.ibm.com - Kathy Chan
- * 20060609 86421 kathy@ca.ibm.com - Kathy Chan
- * 20060727 144354 kathy@ca.ibm.com - Kathy Chan
- * 20060728 145426 kathy@ca.ibm.com - Kathy Chan
- * 20060810 135395 makandre@ca.ibm.com - Andrew Mak, Enable WTP Web service framework opening Java editor
- * 20060821 153833 makandre@ca.ibm.com - Andrew Mak, Allow the Web Service Test extension point to specify the supported client runtime
- * 20060825 155114 pmoogk@ca.ibm.com - Peter Moogk
- * 20070502 180304 gilberta@ca.ibm.com - Gilbert Andrews
- * 20071031 140518 joan@ca.ibm.com - Joan Haggarty
- * 20071218 200193 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080325 184761 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080416 215084 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080506 227848 makandre@ca.ibm.com - Andrew Mak, Disabled "Run on Server" checkbox is in checked state
- * 20080729 241275 ericdp@ca.ibm.com - Eric D. Peters, No Validation error generating Web Service client if dialog hidden
- * 20090724 284582 mahutch@ca.ibm.com - Mark Hutchinson, WS Test facility selection ignored when wizard completes. Default always chosen
- * 20100528 314934 mahutch@ca.ibm.com - Mark Hutchinson, Pressing "Launch" on service test page causes test client not to launch on "Client test" page
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets.binding;
-
-import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.command.common.ComputeEndpointCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.ComputeProxyEndpointCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateMonitorCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.ManageServerStartUpCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.command.data.ServerInstToIServerTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.common.FinishFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ScenarioCleanupCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.extension.ClientRootFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.extension.PreClientDevelopCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.selection.SelectionTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishToPrivateUDDICommandFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishWSWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestDelegateCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishDefaultCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishTestFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.TestDefaultingFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WSDLTestLaunchCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WebServiceClientTestArrivalCommand;
-import org.eclipse.jst.ws.internal.creation.ui.extension.PreServiceDevelopCommand;
-import org.eclipse.jst.ws.internal.creation.ui.extension.ServiceRootFragment;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidget;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetOutputCommand;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.runtime.ServerRuntimeSelectionWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.test.LaunchFragment;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.test.ServiceTestFragment;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.test.ServiceTestWidget;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.test.WebServiceTestDefaultingCommand;
-import org.eclipse.wst.command.internal.env.core.common.Condition;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand;
-import org.eclipse.wst.ws.internal.ui.command.OpenEditorCommand;
-
-public class ServerWidgetBinding implements CommandWidgetBinding
-{
- private CanFinishRegistry canFinishRegistry_;
- private WidgetRegistry widgetRegistry_;
- private DataMappingRegistry dataMappingRegistry_;
- private PublishToPrivateUDDICommandFragment publishToPrivateUDDICmdFrag;
-
- public ServerWidgetBinding()
- {
- publishToPrivateUDDICmdFrag = new PublishToPrivateUDDICommandFragment();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
- */
- public CommandFragmentFactory create()
- {
- return new CommandFragmentFactory()
- {
- public CommandFragment create()
- {
- return new ServiceRootCommandFragment();
- }
- };
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
- */
- public void registerCanFinish(CanFinishRegistry canFinishRegistry)
- {
- canFinishRegistry_ = canFinishRegistry;
- publishToPrivateUDDICmdFrag.registerCanFinish(canFinishRegistry_);
- }
-
- /* (non-Javadoc),
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- dataMappingRegistry_ = dataRegistry;
-
- // Before ServerWizardWidget
- dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ServiceGeneration", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "MonitorService", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "MonitorService", CreateMonitorCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "MonitorService", ComputeEndpointCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "MonitorService", ComputeProxyEndpointCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "PublishService", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ClientGeneration", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InstallClient", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ResourceContext", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DevelopService", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "AssembleService", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DeployService", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InstallService", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "StartService", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "TestService", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DevelopClient", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "AssembleClient", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DeployClient", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "StartClient", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "TestClient", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InitialProject", ServerWizardWidget.class);
-
-
-
- // After ServerWizardWidget
- dataRegistry.addMapping(ServerWizardWidget.class, "ServiceTypeRuntimeServer", ServerWizardWidgetOutputCommand.class );
- dataRegistry.addMapping(ServerWizardWidget.class, "InstallService", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "InstallClient", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "StartService", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "TestService", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "MonitorService", CreateMonitorCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "MonitorService", ComputeEndpointCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "MonitorService", ComputeProxyEndpointCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "PublishService", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "GenerateProxy", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "ClientTypeRuntimeServer", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "ResourceContext", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "ObjectSelection", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "DevelopService", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "AssembleService", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "DeployService", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "DevelopClient", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "AssembleClient", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "DeployClient", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "StartClient", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "TestClient", ServerWizardWidgetOutputCommand.class);
-
- // Before ObjectSelectionWidget
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "TestService", ClientTestWidget.class );
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "TestService",FinishTestFragment.class);
-
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "GenerateProxy", ClientFragment.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "GenerateProxy", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceProjectName", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceEarProjectName", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentType", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceNeedEAR", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientNeedEAR", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentType", ServerWizardWidget.class); //jvh
-
- // After ServerWizardWidget
- dataRegistry.addMapping(ServerWizardWidget.class, "ServiceTypeRuntimeServer", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "ServiceRuntimeId", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "ClientTypeRuntimeServer", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "ClientRuntimeId", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "ServiceProjectName", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "ServiceEarProjectName", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "ServiceComponentType", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "ClientProjectName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "ClientEarProjectName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "ClientComponentType", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "ServiceNeedEAR", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "ClientNeedEAR", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "WebServicesParser", ServerExtensionDefaultingCommand.class );
-
- // Map fragments that depend on data.
- dataRegistry.addMapping(ServerWizardWidget.class, "ClientTypeRuntimeServer", ClientExtensionFragment.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "ServiceTypeRuntimeServer", ServerExtensionFragment.class);
-
- // CreateMonitorCommand
- dataRegistry.addMapping(CreateMonitorCommand.class, "MonitoredPort", ComputeEndpointCommand.class);
- dataRegistry.addMapping(CreateMonitorCommand.class, "MonitoredPort", ComputeProxyEndpointCommand.class);
-
- // ComputeEndpointCommand
- dataRegistry.addMapping(ComputeEndpointCommand.class, "Endpoint", ServiceTestWidget.class);
- dataRegistry.addMapping(ComputeEndpointCommand.class, "Endpoint", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ComputeEndpointCommand.class, "Endpoint", ComputeProxyEndpointCommand.class);
-
- // ComputeProxyEndpointCommand
- dataRegistry.addMapping(ComputeProxyEndpointCommand.class, "Endpoint", ClientTestDelegateCommand.class);
-
- // 145426
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyEndpoint", ComputeProxyEndpointCommand.class);
-
- //ServiceTestWidget mappings
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", ServiceTestWidget.class);
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", ServiceTestWidget.class);
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", CreateMonitorCommand.class);
- dataRegistry.addMapping(ServerExtensionOutputCommand.class, "WsdlURI", ServiceTestWidget.class);
- dataRegistry.addMapping(ServerExtensionOutputCommand.class, "ServiceServerInstanceId", ServiceTestWidget.class);
- dataRegistry.addMapping(ServerExtensionOutputCommand.class, "WsdlURI", ComputeEndpointCommand.class);
- dataRegistry.addMapping(ServerExtensionOutputCommand.class, "WebServicesParser", ComputeEndpointCommand.class);
- dataRegistry.addMapping(WebServiceTestDefaultingCommand.class, "ServiceTestFacilities", ServiceTestWidget.class);
- dataRegistry.addMapping(WebServiceTestDefaultingCommand.class, "Environment", ServiceTestWidget.class);
- dataRegistry.addMapping(ServiceTestWidget.class, "LaunchedServiceTestName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServiceTestWidget.class, "LaunchedServiceTestName", FinishTestFragment.class);
- dataRegistry.addMapping(ServiceTestWidget.class, "LaunchedServiceTestName", TestDefaultingFragment.class);
- dataRegistry.addMapping(ServiceTestWidget.class, "ServiceTestFacilities", TestDefaultingFragment.class);
-
- // Before Client Test widget.
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientTestWidget.class );
-
- // Before ClientTestWidget
-
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProject", ClientTestWidget.class );
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProjectEAR", ClientTestWidget.class );
- dataRegistry.addMapping(TestDefaultingFragment.class, "TestFacility",ClientTestWidget.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Folder",ClientTestWidget.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "JspFolder",ClientTestWidget.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "RunClientTest",ClientTestWidget.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Methods",ClientTestWidget.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "RunTestClient",ClientTestWidget.class);
-
- // After ClientTestWidget
- dataRegistry.addMapping(ClientTestWidget.class, "SampleProjectEAR",FinishDefaultCommand.class);
- dataRegistry.addMapping(ClientTestWidget.class, "SampleProject",FinishDefaultCommand.class);
- dataRegistry.addMapping(ClientTestWidget.class, "TestFacility",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientTestWidget.class, "Folder",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientTestWidget.class, "JspFolder",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientTestWidget.class, "RunTestClient",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientTestWidget.class, "Methods",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientTestWidget.class, "TestService",FinishTestFragment.class);
- dataRegistry.addMapping(ClientTestWidget.class, "TestID",FinishTestFragment.class);
- dataRegistry.addMapping(ClientTestWidget.class, "IsTestWidget",FinishTestFragment.class);
- // PublishWSWidget
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "PublishService", PublishWSWidget.class, "PublishToPublicUDDI", null);
-
- // PublishToPrivateUDDICommandFragment
- dataRegistry.addMapping(PublishWSWidget.class, "PublishToPrivateUDDI", PublishToPrivateUDDICommandFragment.class);
-
- // LaunchWebServicesExplorerCommand
- dataRegistry.addMapping(PublishWSWidget.class, "PublishToPrivateUDDI", LaunchFragment.class);
- dataRegistry.addMapping(PublishWSWidget.class, "PublishToPublicUDDI", LaunchFragment.class);
- // TODO Need defaults for these properties.
- dataRegistry.addMapping(PublishWSWidget.class, "ForceLaunchOutsideIDE", WSExplorerLauncherCommand.class);
- dataRegistry.addMapping(PublishWSWidget.class, "LaunchOptions", WSExplorerLauncherCommand.class);
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
- */
- public void registerWidgetMappings(WidgetRegistry widgetRegistry)
- {
-
- widgetRegistry_ = widgetRegistry;
- publishToPrivateUDDICmdFrag.registerWidgetMappings(widgetRegistry_);
-
- widgetRegistry.add( "ServerWizardWidget",
- ConsumptionUIMessages.PAGE_TITLE_WS_PROJECT,
- ConsumptionUIMessages.PAGE_DESC_WS_SERVICE,
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new ServerWizardWidget( true, false );
- }
- } );
-
- widgetRegistry.add( "TestService",
- ConsumptionUIMessages.PAGE_TITLE_WSTEST,
- ConsumptionUIMessages.PAGE_DESC_WSTEST,
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new ServiceTestWidget();
- }
- } );
-
- widgetRegistry.add( "ClientTestWidget",
- ConsumptionUIMessages.PAGE_TITLE_WS_SAMPLE,
- ConsumptionUIMessages.PAGE_DESC_WS_SAMPLE,
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new ClientTestWidget();
- }
- });
-
- widgetRegistry.add( "Publish",
- ConsumptionUIMessages.PAGE_TITLE_WS_PUBLISH,
- ConsumptionUIMessages.PAGE_DESC_WS_PUBLISH,
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new PublishWSWidget(true);
- }
- } );
- }
-
- private class ClientFragment extends BooleanFragment
- {
- boolean genProxy_ = false;
-
- public ClientFragment()
- {
- setCondition( new Condition()
- {
- public boolean evaluate()
- {
- return genProxy_;
- }
- });
-
- SequenceFragment clientRoot = new SequenceFragment();
-
- clientRoot.add( new SimpleFragment( new ClientExtensionDefaultingCommand( false ), ""));
- //clientRoot.add(new SimpleFragment(new ClientServerDeployableConfigCommand(), "")); //Note: added here for client
- //clientRoot.add( new ClientExtensionFragment() );
- clientRoot.add( new ClientRootFragment() );
- clientRoot.add( new SimpleFragment( new ClientExtensionOutputCommand(), "" ));
-
- setTrueFragment( clientRoot );
- }
-
- public void setGenerateProxy( boolean genProxy )
- {
- genProxy_ = genProxy;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- // Map the output of the service scenario to the client scenario.
- dataRegistry.addMapping( ServerExtensionOutputCommand.class, "WebServicesParser", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping( ServerExtensionOutputCommand.class, "WsdlURI", ClientExtensionDefaultingCommand.class );
- dataRegistry.addMapping( ServerExtensionOutputCommand.class, "ServiceServerFactoryId", ClientExtensionDefaultingCommand.class );
- dataRegistry.addMapping( ServerExtensionOutputCommand.class, "ServiceServerInstanceId", ClientExtensionDefaultingCommand.class );
-
-
- // Setup the PreClientDevelopCommand.
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "TestService", PreClientDevelopCommand.class);
-
- dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "ResourceContext", PreClientDevelopCommand.class);
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "DevelopClient", PreClientDevelopCommand.class);
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "AssembleClient", PreClientDevelopCommand.class);
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "DeployClient", PreClientDevelopCommand.class );
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "InstallClient", PreClientDevelopCommand.class );
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "StartClient", PreClientDevelopCommand.class, "StartService", null);
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", PreClientDevelopCommand.class );
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientRuntimeId", PreClientDevelopCommand.class );
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientJ2EEVersion", PreClientDevelopCommand.class);
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProject", PreClientDevelopCommand.class, "Module", null );
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProjectType", PreClientDevelopCommand.class, "ModuleType", null);
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProjectEAR", PreClientDevelopCommand.class, "Ear", null );
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "WsdlURI", PreClientDevelopCommand.class);
- dataRegistry.addMapping( PreClientDevelopCommand.class, "WebService", ClientExtensionOutputCommand.class, "WebServiceClient", null );
- }
- }
-
- private class ServiceRootCommandFragment extends SequenceFragment
- {
- public ServiceRootCommandFragment()
- {
- add( new SimpleFragment( new ScenarioCleanupCommand(), "" ));
-
- add( new SimpleFragment( new ServerWizardWidgetDefaultingCommand(), ""));
- add (new SimpleFragment( new ObjectSelectionOutputCommand(), ""));
- add( new SimpleFragment( new ServerRuntimeSelectionWidgetDefaultingCommand(), ""));
- add( new SimpleFragment( "ServerWizardWidget" ) );
- add( new SimpleFragment( new ServerWizardWidgetOutputCommand(), "" ));
- add( new SimpleFragment( new ServerExtensionDefaultingCommand(), ""));
- add( new ServiceRootFragment() );
- add( new SimpleFragment( new ServerExtensionOutputCommand(), "" ));
- add(new SimpleFragment(new CreateMonitorCommand(), ""));
- add(new SimpleFragment(new ComputeEndpointCommand(), ""));
- add( new ServiceTestFragment( "TestService") );
- add( new ClientFragment() );
- add( new SimpleFragment(new TestDefaultingFragment(),""));
- add( new SimpleFragment(new ComputeProxyEndpointCommand(), ""));
- add( new ClientTestFragment( "ClientTestWidget") );
- add( new SimpleFragment( "Publish") );
- add(publishToPrivateUDDICmdFrag);
- add( new SimpleFragment( new OpenEditorCommand(), "") );
- add(new LaunchFragment());
- add(new FinishFragment());
-
- add( new SimpleFragment( new ScenarioCleanupCommand(), "" ));
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- publishToPrivateUDDICmdFrag.registerDataMappings(dataMappingRegistry_);
-
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ServerWizardWidgetDefaultingCommand.class );
-
- // Map ServerWizardWidgetDefaultingCommand to ObjectSelectionOutputCommand
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InitialSelection", ObjectSelectionOutputCommand.class, "ObjectSelection", null);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ObjectSelectionOutputCommand.class, "TypeRuntimeServer", null);
-
- // Map ServerWizardWidgetDefaultingCommand to ServerWizardWidgetOutputCommand
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "GenerateProxy", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DevelopService", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "AssembleService", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DeployService", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DevelopClient", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "AssembleClient", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DeployClient", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InstallClient", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "StartClient", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "TestClient", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InstallService", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "StartService", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "TestService", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "RunTestClient", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "PublishService", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "GenerateProxy", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ResourceContext", ServerWizardWidgetOutputCommand.class);
-
- // Map ServerWizardWidgetOutputCommand.
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InitialProject", ServerRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ServerRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InstallService", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "StartService", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "TestService", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "TestService", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "PublishService", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "PublishService", PublishWSWidget.class, "PublishToPublicUDDI", null);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "GenerateProxy", ServerRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InstallClient", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "RunTestClient", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "GenerateProxy", ClientExtensionDefaultingCommand.class); // KSC
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ResourceContext", ClientExtensionDefaultingCommand.class);
-
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "DevelopService", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "AssembleService", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "DeployService", ServerExtensionDefaultingCommand.class);
-
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "InstallClient", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "StartClient", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "DevelopClient", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "AssembleClient", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "DeployClient", ClientExtensionDefaultingCommand.class);
-
-
- //Map ObjectSelectionOutputCommand to ServerRuntimeSelectionWidgetDefaultingCommand
- dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialSelection", null);
- dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialSelection", null);
- dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "Project", ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialProject", null);
- dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "Project", ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialProject", null);
-
- //Map ObjectSelectionOutputCommand to ServerWizardWidgetOutputCommand
- dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", ServerWizardWidgetOutputCommand.class);
-
- //to the test wizard
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "GenerateProxy", ServiceTestFragment.class);
- dataRegistry.addMapping(ServerExtensionOutputCommand.class, "WsdlURI", WSDLTestLaunchCommand.class);
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", WSDLTestLaunchCommand.class);
-
- // Map ServerRuntimeSelectionWidgetDefaultingCommand
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceRuntimeId", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientRuntimeId", ClientExtensionDefaultingCommand.class);
- //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceProject2EARProject", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceProjectName", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceEarProjectName", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentType", ServerExtensionDefaultingCommand.class);
- //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentName", ServerExtensionDefaultingCommand.class);
- //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceEarComponentName", ServerExtensionDefaultingCommand.class);
- //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "Runtime2ClientTypes", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", ClientExtensionDefaultingCommand.class);
- //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", ClientExtensionDefaultingCommand.class);
- //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentType", ClientExtensionDefaultingCommand.class);
- //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceJ2EEVersion", ServerExtensionDefaultingCommand.class);
- //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientJ2EEVersion", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "GenerateProxy", ClientFragment.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "GenerateProxy", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceNeedEAR", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialProject", PreServiceDevelopCommand.class );
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientNeedEAR", ClientExtensionDefaultingCommand.class);
-
- dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "InstallService", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "StartService", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "TestService", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "MonitorService", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "PublishService", ServerExtensionDefaultingCommand.class);
-
-
- // Map ServerExtensionDefaultingCommand
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerExtensionFragment.class);
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "TestService", ServiceTestFragment.class);
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "Publish", PublishToPrivateUDDICommandFragment.class);
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer",WSDLTestLaunchCommand.class);
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "Project", ServerExtensionDefaultingCommand.class, "InitialProject", null);
-
- // Setup the PreServiceDevelopCommand.
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "DevelopService", PreServiceDevelopCommand.class);
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "AssembleService", PreServiceDevelopCommand.class);
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "DeployService", PreServiceDevelopCommand.class);
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "InstallService", PreServiceDevelopCommand.class);
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "StartService", PreServiceDevelopCommand.class);
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "TestService", PreServiceDevelopCommand.class);
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "PublishService", PreServiceDevelopCommand.class);
-
- dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "GenerateProxy", PreServiceDevelopCommand.class);
- dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "ResourceContext", PreServiceDevelopCommand.class);
- dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "ObjectSelection", PreServiceDevelopCommand.class, "Selection", new SelectionTransformer() );
-
- //dataRegistry.addMapping( ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentType", PreServiceDevelopCommand.class, "ModuleType", null);
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", PreServiceDevelopCommand.class );
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceRuntimeId", PreServiceDevelopCommand.class );
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceJ2EEVersion", PreServiceDevelopCommand.class);
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServerProject", PreServiceDevelopCommand.class, "Module", null );
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServerProjectEAR", PreServiceDevelopCommand.class, "Ear", null );
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceComponentType", PreServiceDevelopCommand.class, "ModuleType", null );
-
- dataRegistry.addMapping( PreServiceDevelopCommand.class, "WebService", ServerExtensionOutputCommand.class );
-
- // Map ClientExtensionDefaultingCommand
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionFragment.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", FinishDefaultCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestFragment.class );
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestWidget.class );
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "CanRunTestClient", ClientTestWidget.class );
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "CanRunTestClient", ClientTestDelegateCommand.class );
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "RunTestClient", ClientTestWidget.class );
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientNeedEAR", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientEarProjectName", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientEarComponentName", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", WebServiceClientTestArrivalCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", WebServiceClientTestArrivalCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "LaunchedServiceTestName", WebServiceClientTestArrivalCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServer", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "RunTestClient",ClientTestDelegateCommand.class);
-
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "RunTestClient", ClientTestDelegateCommand.class);
-
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "TestClient", ClientExtensionDefaultingCommand.class, "TestService", null);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "TestClient", TestDefaultingFragment.class, "GenerateProxy", null);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", TestDefaultingFragment.class, "GenerateProxy", null);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientRuntimeId", TestDefaultingFragment.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestFragment.class, "GenerateProxy", null);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", FinishTestFragment.class, "CanGenerateProxy", null);
-
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ServerExtensionOutputCommand.class, "WsdlURI", ClientTestDelegateCommand.class);
-
- dataRegistry.addMapping(ServerExtensionOutputCommand.class, "ServiceServerInstanceId", CreateMonitorCommand.class);
-
- // Map ServerExtensionOutputCommand for ServerStart()
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProjectEAR", ServerExtensionOutputCommand.class, "EarProjectName", null);
-
- // MAP post server config call
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", ClientExtensionOutputCommand.class, "EarProjectName", null);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServerInstance", ClientExtensionOutputCommand.class, "ExistingServerId", null);
-
- // Map ClientExtensionOutputCommand
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "CanGenerateProxy", ClientTestFragment.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", WebServiceClientTestArrivalCommand.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "SetEndpointMethod", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ServerInstanceId", FinishDefaultCommand.class);
-
- // Map ManageServerStartUpCommand
- dataRegistry.addMapping(ServerExtensionOutputCommand.class, "IsWebProjectStartupRequested", ManageServerStartUpCommand.class);
-
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "StartService", ManageServerStartUpCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "TestService", ManageServerStartUpCommand.class);
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", ManageServerStartUpCommand.class, "ServiceProject", new StringToIProjectTransformer());
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerServer", ManageServerStartUpCommand.class,"ServiceServerTypeId", null);
-
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", ManageServerStartUpCommand.class, "SampleProject", new StringToIProjectTransformer());
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServerInstance", ManageServerStartUpCommand.class,"SampleExistingServer", new ServerInstToIServerTransformer());
-
- // Map WebServiceClientTestArrivalCommand
- dataRegistry.addMapping(TestDefaultingFragment.class, "TestFacility",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Folder",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "JspFolder",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "RunClientTest",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Methods",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProject",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProjectEAR",ClientTestDelegateCommand.class);
-
- // Map OpenEditorCommand
- dataRegistry.addMapping( PreServiceDevelopCommand.class, "WebService", OpenEditorCommand.class );
- dataRegistry.addMapping( PreServiceDevelopCommand.class, "Context", OpenEditorCommand.class );
-
- //Map Finish Command
-
-
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java
deleted file mode 100644
index 19c2278..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,668 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060131 121071 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060227 124392 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060315 131963 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060418 129688 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060427 126780 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060427 138058 joan@ca.ibm.com - Joan Haggarty
- * 20060523 133714 joan@ca.ibm.com - Joan Haggarty
- * 20060525 143843 joan@ca.ibm.com - Joan Haggarty
- * 20060905 156230 kathy@ca.ibm.com - Kathy Chan, Handling projects with no target runtime
- * 20070319 159458 mahutch@ca.ibm.com - Mark Hutchinson added in some null checks
- * 20071212 200193 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080326 171705 trungha@ca.ibm.com - Trung, improve AntTask errors report
- * 20080326 221364 kathy@ca.ibm.com - Kathy Chan
- * 20080402 225032 makandre@ca.ibm.com - Andrew Mak
- * 20080527 234226 kathy@ca.ibm.com - Kathy Chan
- * 20080730 242611 zhang@ca.ibm.com - Peter Moogk
- * 20080925 242312 ericdp@ca.ibm.com - Eric D. Peters, Cannot create BUJB WS from Bean in Java project using ANT tasks
- * 20100929 326549 mahutch@ca.ibm.com - Mark Hutchinson, Web Service Wizard Can Default to invalid project type
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets.runtime;
-
-import java.util.ArrayList;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.ILog;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.common.FacetMatcher;
-import org.eclipse.jst.ws.internal.consumption.common.FacetUtils;
-import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.common.DefaultingUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.preferences.PersistentServerRuntimeContext;
-import org.eclipse.jst.ws.internal.consumption.ui.preferences.ProjectTopologyContext;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ClientRuntimeSelectionWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.FacetMatchCache;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.RuntimeDescriptor;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.ServiceRuntimeDescriptor;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ui.WSUIPluginMessages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-public class ServerRuntimeSelectionWidgetDefaultingCommand extends ClientRuntimeSelectionWidgetDefaultingCommand
-{
- private boolean generateProxy_=true; //jvh
-
- private TypeRuntimeServer serviceIds_;
- private boolean serviceIdsFixed_ = false;
- private String serviceRuntimeId_;
- private String serviceProjectName_;
- private String serviceEarProjectName_;
- private String serviceComponentType_;
- private IProject initialProject_;
- private boolean serviceNeedEAR_ = true;
- private FacetMatcher serviceFacetMatcher_;
-
- public ServerRuntimeSelectionWidgetDefaultingCommand()
- {
- super();
- }
-
-
- /**
- * Defaults the following bits of information in the following order:
- * serviceRuntimeId_ : the serviceRuntimeId. Must be defaulted to non-empty String.
- * serviceIds_.runtimeId_: the Web service runtime id. Must be defaulted to non-empty String.
- * serviceProjectName_ : the name of the service project. Must be non-empty. May or may not exist.
- * serviceComponentType_: the id of the service project template. Must be empty if the service
- * project exists. Must be non-empty of the service project does not exist.
- * serviceIds_.serverId_: the server type id. May be an empty String if the defaulted Web service runtime
- * does not require a server.
- * serviceIds_.serverInstanceId_: the server id. May be null or an empty String.
- * serviceNeedEAR_: true if an EAR is needed. False otherwise.
- * serviceEarProjectName_: the service EAR project. Must be empty if the serviceNeedEAR_ is false.
- * Must be non-empty if the serviceNeedEAR_ is true.
- * Defaults the parallel information on the client-side if needed
- * (@see ClientRuntimeSelectionWidgetDefaultingCommand#execute).
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
-
- try
- {
-
- //**Step 1** Default the serviceRuntime and the Web service runtime.
- //serviceIdsFixed_ is set to true for the Ant scenario. It's always false for the wizard
- //scenarios.
- if (serviceIdsFixed_)
- {
- //Set the serviceRuntime based on the runtime and server.
- //If user set a service project use that as initial project otherwise default from initial selection.
- //(above is true for all scenarios except BUJ from Java Project- for BUJ from Java Project need to create a dependancy in downstream commands
- //between the initial project and the service project so don't use as the initial selection
- if (serviceProjectName_ != null)
- {
- IProject serviceProject = ResourcesPlugin.getWorkspace().getRoot().getProject(serviceProjectName_);
- //use the user provided service project to define the runtime triplet (if user provided service project is not valid for
- //the web service type, the runtime triplet will contain a suitable project if one exists)
- DefaultRuntimeTriplet drt = getDefaultRuntime(serviceProject, serviceIds_.getTypeId(), false, serviceIds_.getServerId());
- if (!(WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(serviceIds_.getTypeId()) == WebServiceScenario.BOTTOMUP &&
- FacetUtils.isJavaProject(initialProject_))){
- //user set a service project, use as initial project
- //initialProject_ is the project where the selected object resides, set to be the service project for now for all scenarios except BUJ from Java Project (for
- //BUJ from Java Project need to create a dependancy in downstream commands between the initial project and the service project)
- initialProject_ = serviceProject;
- }
- serviceFacetMatcher_ = drt.getFacetMatcher();
- serviceProjectName_ = drt.getProjectName(); //a suitable service project for the web service type, or null if a suitable project does not exist
- serviceRuntimeId_ = drt.getRuntimeId();
-
- if (serviceRuntimeId_ != null)
- {
- serviceIds_.setRuntimeId(WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceRuntimeId_).getRuntime()
- .getId());
- }
- }
- else
- {
- DefaultRuntimeTriplet drt = getDefaultServiceRuntimeForFixedRuntimeAndServer(initialProject_, serviceIds_.getServerId());
- serviceFacetMatcher_ = drt.getFacetMatcher();
- serviceProjectName_ = drt.getProjectName();
- serviceRuntimeId_ = drt.getRuntimeId();
- }
- }
- else
- {
- // Set the runtime based on the initial selection
- DefaultRuntimeTriplet drt = getDefaultRuntime(initialProject_, serviceIds_.getTypeId(), false, serviceIds_.getServerId());
- if (drt.getProjectName() == null && initialProject_ != null
- && WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(serviceIds_.getTypeId()) == WebServiceScenario.BOTTOMUP
- && WebServiceRuntimeExtensionUtils2.getWebServiceImplIdFromTypeId(serviceIds_.getTypeId()).equals("org.eclipse.jst.ws.wsImpl.ejb") )
- {
- drt.setProjectName(initialProject_.getName());
- }
- serviceFacetMatcher_ = drt.getFacetMatcher();
- serviceProjectName_ = drt.getProjectName();
- serviceRuntimeId_ = drt.getRuntimeId();
-
- if (serviceRuntimeId_ != null)
- {
- serviceIds_.setRuntimeId(WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceRuntimeId_).getRuntime()
- .getId());
- }
- }
-
- //**Step 2** Default the service project if it was not already defaulted
- //as part of defaulting the Web service runtime.
- if (serviceProjectName_ == null)
- {
- // Project name did not get set when the runtime was set, so set it now
- serviceProjectName_ = getDefaultServiceProjectName();
- }
-
- //**Step 3** Default the service project type.
- IProject serviceProject = ResourcesPlugin.getWorkspace().getRoot().getProject(serviceProjectName_);
- if (!serviceProject.exists())
- {
- // Set the project template
- serviceComponentType_ = getDefaultServiceProjectTemplate();
- }
- else
- {
- //Set it to an empty String
- serviceComponentType_ = "";
- }
- //**Step 4** Default the server if this is not an Ant scenario.
- if (!serviceIdsFixed_)
- {
- // Set the server
- IStatus serverStatus = setServiceDefaultServer();
- if (serverStatus.getSeverity() == Status.ERROR)
- {
- env.getStatusHandler().reportError(serverStatus);
- return serverStatus;
- }
- }
-
- //**Step 5** Default clientNeedEAR and client EAR if an EAR is needed
- setDefaultServiceEarProject();
-
- // jvh - for now comment out generate proxy
- // need to look at defaulting based on an event
- // on page 1 - when client generation goes from none
- // to develop...
- /*if (generateProxy_)
- {*/
- //Default the client-side.
- IStatus clientSideStatus = defaultClientSide(monitor);
- if (clientSideStatus.getSeverity() == Status.ERROR)
- {
- return clientSideStatus;
- }
- // }
-
- return Status.OK_STATUS;
-
- } catch (Exception e)
- {
- // Catch all Exceptions in order to give some feedback to the user
- IStatus errorStatus = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_ERROR_TASK_EXCEPTED,
- new String[] { e.getMessage() }), e);
-
- // If the exception has no error msg, it's kind of useless to the user so let's log it
- if ( e.getMessage() == null){
- ILog pluginlog = WebServiceConsumptionUIPlugin.getInstance().getLog();
- pluginlog.log(errorStatus);
-
- // create a new IStatus which has a non-null msg, this is to be thrown to the user.
- errorStatus = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_ERROR_TASK_EXCEPTED,
- new String[] { WSUIPluginMessages.MSG_SEE_ERROR_LOG }), e);
- }
-
- env.getStatusHandler().reportError(errorStatus);
- return errorStatus;
- }
- }
-
- private IStatus defaultClientSide(IProgressMonitor monitor)
- {
- IStatus clientDefaultFromServiceStatus = defaultClientSideFromServiceSide(serviceProjectName_, serviceIds_, serviceNeedEAR_, serviceEarProjectName_);
-
- // If an error status is returned, the only property that was set on
- // ClientRuntimeSelectionWidgetDefaultingCommand is clientProjectName_.
- // The rest of the properties including clientRuntimeId_, clientComponentType_,
- // all the values in clientIds_, clientNeedEAR_, and clientEarProjectName_
- // have not been set because the service side server and
- // web service runtime could not be used on the client side. Run the entire
- // client-side defaulting algorithm using clientProjectName_ as the
- // clientInitialProject_. Then update the clientEarProjectName_ based on the
- // service side EAR.
- if (clientDefaultFromServiceStatus.getSeverity() == IStatus.ERROR)
- {
- // 1. Run client side defaulting from scratch with clientInitialProject_
- // set to the new clientProjectName_.
- IProject clientProject = ResourcesPlugin.getWorkspace().getRoot().getProject(getClientProjectName());
- setClientInitialProject(clientProject);
- IStatus clientExecuteStatus = super.execute(monitor, null);
- if (clientExecuteStatus.getSeverity() == Status.ERROR)
- {
- return clientExecuteStatus;
- }
-
- // 2. Update the client-side EAR if serviceNeedEAR_ is true;
- if (serviceNeedEAR_)
- {
- defaultClientEarFromServiceEar(serviceProjectName_, serviceEarProjectName_);
- }
- }
-
- return Status.OK_STATUS;
-
- }
-
- private void setDefaultServiceEarProject()
- {
- //Don't need an ear if this is a Java project, or if the selected template is jst.utility
- IProject serviceProject = ResourcesPlugin.getWorkspace().getRoot().getProject(serviceProjectName_);
- if (serviceProject.exists())
- {
- serviceNeedEAR_ = !(FacetUtils.isJavaProject(serviceProject));
- }
- else
- {
- serviceNeedEAR_ = !(FacetUtils.isUtilityTemplate(serviceComponentType_));
- }
-
- //If serviceNeedEAR_ is still true, it means that we're not dealing with a Java project
- //or Java project type. Check the server.
-
-
- if (serviceNeedEAR_)
- {
-
- // Determine if an ear selection is needed based on the server type.
- String serverId = serviceIds_.getServerId();
- if (serverId != null)
- {
- // Use the server type
- String serverTargetId = ServerUtils.getRuntimeTargetIdFromFactoryId(serverId);
- if (serverTargetId != null && serverTargetId.length() > 0)
- {
- if (!ServerUtils.isTargetValidForEAR(serverTargetId, "13"))
- {
- // Default the EAR selection to be empty
- serviceNeedEAR_ = false;
- }
- }
- } else { // serverId == null, assume that it does not need EAR
- serviceNeedEAR_ = false;
- }
- }
-
- if (serviceNeedEAR_)
- {
- serviceEarProjectName_ = DefaultingUtils.getDefaultEARProjectName(serviceProjectName_);
- }
- else
- {
- serviceEarProjectName_ = "";
- }
- }
-
- private IStatus setServiceDefaultServer()
- {
- //Choose an existing server the module is already associated with if possible
- IProject serviceProject = ResourcesPlugin.getWorkspace().getRoot().getProject(serviceProjectName_);
- IServer[] configuredServers = null;
- if(serviceProject.exists())
- configuredServers = ServerUtil.getServersByModule(ServerUtils.getModule(serviceProject), null);
-
- if (configuredServers!=null && configuredServers.length>0)
- {
- serviceIds_.setServerId(configuredServers[0].getServerType().getId());
- serviceIds_.setServerInstanceId(configuredServers[0].getId());
- return Status.OK_STATUS;
- }
-
- //If the project exists, choose a suitable server or server type based on the existing project's runtime or facets
- if (serviceProject.exists())
- {
- IServer server = getServerFromProject(serviceProjectName_, serviceFacetMatcher_);
- if (server != null)
- {
- serviceIds_.setServerId(server.getServerType().getId());
- serviceIds_.setServerInstanceId(server.getId());
- return Status.OK_STATUS;
- }
- else
- {
- IServerType serverType = getServerTypeFromProject(serviceProjectName_, serviceFacetMatcher_);
- if (serverType != null)
- {
- serviceIds_.setServerId(serverType.getId());
- return Status.OK_STATUS;
- }
- }
- }
-
- //Haven't picked a server/server type on the basis of the project. Pick a server/server type
- //that is compatible with the serviceRuntimeId.
- IServer server = getServerFromServiceRuntimeId();
- if (server!=null)
- {
- serviceIds_.setServerId(server.getServerType().getId());
- serviceIds_.setServerInstanceId(server.getId());
- return Status.OK_STATUS;
- }
-
- IServerType serverType = getServerTypeFromServiceRuntimeId();
- if (serverType != null)
- {
- serviceIds_.setServerId(serverType.getId());
- return Status.OK_STATUS;
- }
-
- //No suitable server was found. Popup an error.
- RuntimeDescriptor runtimeDescriptor = WebServiceRuntimeExtensionUtils2.getRuntimeById(serviceIds_.getRuntimeId());
- if (runtimeDescriptor.getServerRequired())
- {
- String runtimeLabel = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(serviceIds_.getRuntimeId());
- IStatus status = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_ERROR_NO_SERVER_RUNTIME, new String[]{runtimeLabel}) );
- return status;
- }
-
- return Status.OK_STATUS;
- }
-
- private IServer getServerFromServiceRuntimeId()
- {
- IServer[] servers = ServerCore.getServers();
- if (servers != null && servers.length > 0)
- {
- PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
- String preferredServerFactoryId = context.getServerFactoryId();
-
- //If a server of the preferred server type is present, check that one first
- for (int j = 0; j < servers.length; j++)
- {
- if (servers[j] != null && servers[j].getServerType() != null)
- {
- String serverFactoryId = servers[j].getServerType().getId();
- if (serverFactoryId.equals(preferredServerFactoryId))
- {
- if (WebServiceRuntimeExtensionUtils2.doesServiceRuntimeSupportServer(serviceRuntimeId_, serverFactoryId))
- {
- return servers[j];
- }
- }
- }
- }
-
- //A server of the preferred server type could not be found or did not match. Check all the existing servers.
- for (int i = 0; i < servers.length; i++)
- {
- if (servers[i] != null && servers[i].getServerType() != null)
- {
- String serverFactoryId = servers[i].getServerType().getId();
- if (WebServiceRuntimeExtensionUtils2.doesServiceRuntimeSupportServer(serviceRuntimeId_, serverFactoryId))
- {
- return servers[i];
- }
- }
- }
- }
- return null;
- }
-
- private IServerType getServerTypeFromServiceRuntimeId()
- {
- String[] serverTypes = WebServiceRuntimeExtensionUtils2.getServerFactoryIdsByServiceRuntime(serviceRuntimeId_);
- if (serverTypes!=null && serverTypes.length>0)
- {
- //Return the preferred one if it is in the list
- PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
- String preferredServerFactoryId = context.getServerFactoryId();
- for (int i=0; i<serverTypes.length; i++)
- {
- if (serverTypes[i].equals(preferredServerFactoryId))
- {
- return ServerCore.findServerType(serverTypes[i]);
- }
- }
-
- return ServerCore.findServerType(serverTypes[0]);
- }
-
- return null;
- }
-
-
- private String getDefaultServiceProjectTemplate()
- {
- String[] templates = WebServiceRuntimeExtensionUtils2.getServiceProjectTemplates(serviceIds_.getTypeId(), serviceIds_.getRuntimeId(), serviceIds_.getServerId());
-
- //Walk the list of service project types in the project topology preference
- ProjectTopologyContext ptc= WebServiceConsumptionUIPlugin.getInstance().getProjectTopologyContext();
- String[] preferredTemplateIds = ptc.getServiceTypes();
- for (int j = 0; j < preferredTemplateIds.length; j++)
- {
- for (int i = 0; i < templates.length; i++)
- {
- String templateId = templates[i];
- if (templateId.equals(preferredTemplateIds[j]))
- {
- boolean matches = WebServiceRuntimeExtensionUtils2.doesServiceRuntimeSupportTemplate(serviceRuntimeId_, templateId);
- if (matches)
- {
- return templates[i];
- }
- }
- }
- }
-
- //Since the preferredTemplateIds contains the union of all project types for all service runtimes, we are
- //guaranteed to have returned by now, so the code below will never be executed under normal
- //circumstances. Just return something to satisfy the compiler.
- if (templates.length > 0)
- return templates[0];
-
- return "";
-
- }
-
- private String getDefaultServiceProjectName()
- {
- IProject[] projects = FacetUtils.getAllProjects();
- ServiceRuntimeDescriptor desc = WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceRuntimeId_);
- RequiredFacetVersion[] rfvs = desc.getRequiredFacetVersions();
-
- //Check each project for compatibility with the serviceRuntime
- for (int i=0; i<projects.length; i++)
- {
- Set facetVersions = FacetUtils.getFacetsForProject(projects[i].getName());
- org.eclipse.wst.common.project.facet.core.runtime.IRuntime fRuntime = null;
- String fRuntimeName = null;
- fRuntime = FacetUtils.getFacetRuntimeForProject(projects[i].getName());
- if (fRuntime != null)
- {
- fRuntimeName = fRuntime.getName();
- }
-
- if (facetVersions != null)
- {
- FacetMatcher fm = FacetMatchCache.getInstance().getMatchForProject(false, serviceRuntimeId_, projects[i].getName());
- boolean facetRuntimeMatches = true;
- if (fRuntimeName != null)
- {
- facetRuntimeMatches = FacetUtils.isFacetRuntimeSupported(rfvs, fRuntimeName);
- }
-
- if (fm.isMatch() && facetRuntimeMatches)
- {
- serviceFacetMatcher_ = fm;
- return projects[i].getName();
- }
- }
- }
-
- //No project was suitable, return a new project name
- return ResourceUtils.getDefaultWebProjectName();
-
- }
-
- private DefaultRuntimeTriplet getDefaultServiceRuntimeForFixedRuntimeAndServer(IProject project, String runtimePreferredServer)
- {
- String[] serviceRuntimes = WebServiceRuntimeExtensionUtils2.getServiceRuntimesByServiceType(serviceIds_.getTypeId(), runtimePreferredServer);
- ArrayList<String> validServiceRuntimes = new ArrayList<String>();
- for (int i=0; i<serviceRuntimes.length; i++ )
- {
- ServiceRuntimeDescriptor desc = WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceRuntimes[i]);
- if (desc.getRuntime().getId().equals(serviceIds_.getRuntimeId()))
- {
- //Check if this service runtime supports the server
- if (WebServiceRuntimeExtensionUtils2.doesServiceRuntimeSupportServer(desc.getId(), serviceIds_.getServerId()))
- {
- validServiceRuntimes.add(desc.getId());
- if (project != null && project.exists())
- {
- Set facetVersions = FacetUtils.getFacetsForProject(project.getName());
- if (facetVersions != null)
- {
- FacetMatcher fm = FacetMatchCache.getInstance().getMatchForProject(false, serviceRuntimes[i], project.getName());
- if (fm.isMatch())
- {
- DefaultRuntimeTriplet drt = new DefaultRuntimeTriplet();
- drt.setFacetMatcher(fm);
- drt.setProjectName(project.getName());
- drt.setRuntimeId(desc.getId());
- return drt;
- }
- }
- }
-
- }
- }
-
- }
-
- if (validServiceRuntimes.size() > 0)
- {
- //We couldn't match to the initially selected project so return the first valid runtime.
- DefaultRuntimeTriplet drt = new DefaultRuntimeTriplet();
- drt.setFacetMatcher(null);
- drt.setProjectName(null);
- drt.setRuntimeId(((String[])validServiceRuntimes.toArray(new String[0]))[0]);
- return drt;
- }
- else
- {
- //There are no service runtimes that match the fixed runtime and server. Fall back to original algorithm.
- serviceIdsFixed_ = false;
- return getDefaultRuntime(project, serviceIds_.getTypeId(), false, serviceIds_.getServerId());
- }
- }
-
-
-
- public void setInitialSelection(IStructuredSelection selection)
- {
- }
-
- public void setInitialProject(IProject initialProject)
- {
- initialProject_ = initialProject;
- }
-
- public IProject getInitialProject()
- {
- return initialProject_;
- }
-
- public void setInitialComponentName(String name)
- {
- //TODO This method and any mappings to it
- // should be removed if no longer needed.
- }
-
- public void setServiceTypeRuntimeServer( TypeRuntimeServer ids )
- {
- serviceIds_ = ids;
- }
-
- public void setServiceIdsFixed(boolean b)
- {
- serviceIdsFixed_ = b;
- }
-
- public TypeRuntimeServer getServiceTypeRuntimeServer()
- {
- return serviceIds_;
- }
-
- public String getServiceRuntimeId()
- {
- return serviceRuntimeId_;
- }
- /**
- * @return Returns the generateProxy_.
- */
- public boolean getGenerateProxy()
- {
- return generateProxy_;
- }
- /**
- * @param generateProxy_ The generateProxy_ to set.
- */
- public void setGenerateProxy(boolean generateProxy_)
- {
- this.generateProxy_ = generateProxy_;
- }
-
- public String getServiceProjectName()
- {
- return serviceProjectName_;
- }
-
- public String getServiceEarProjectName()
- {
- return serviceEarProjectName_;
- }
-
- public String getServiceComponentType()
- {
- return serviceComponentType_;
- }
-
- public boolean getServiceNeedEAR()
- {
- return serviceNeedEAR_;
- }
-
- // This is for the Ant scenario where the service project name can be set in the property file.
- // If the user has set the ServiceProjectName use it for defaulting purposes
- public void setServiceProjectName(String name)
- {
- serviceProjectName_ = name;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/LaunchFragment.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/LaunchFragment.java
deleted file mode 100644
index 9b6df88..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/LaunchFragment.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- */
-package org.eclipse.jst.ws.internal.creation.ui.widgets.test;
-
-import org.eclipse.wst.command.internal.env.core.common.Condition;
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand;
-
-
-public class LaunchFragment extends BooleanFragment
-{
- private boolean publishToPublicUDDI_;
- private boolean publishToPrivateUDDI_;
-
- public LaunchFragment()
- {
- Condition condition = new Condition()
- {
- public boolean evaluate()
- {
- return (publishToPublicUDDI_ || publishToPrivateUDDI_);
- }
- };
- setCondition( condition );
- setTrueFragment( new SimpleFragment( new WSExplorerLauncherCommand(), "" ) );
- }
-
- public void setPublishToPublicUDDI(boolean publishToPublicUDDI)
- {
- publishToPublicUDDI_ = publishToPublicUDDI;
- }
-
- public void setPublishToPrivateUDDI(boolean publishToPrivateUDDI)
- {
- publishToPrivateUDDI_ = publishToPrivateUDDI;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestFragment.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestFragment.java
deleted file mode 100644
index 730e153..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestFragment.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- */
-package org.eclipse.jst.ws.internal.creation.ui.widgets.test;
-
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WSDLTestLaunchCommand;
-import org.eclipse.wst.command.internal.env.core.common.Condition;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-
-
-public class ServiceTestFragment extends BooleanFragment
-{
- private boolean testService;
- private boolean generateProxy;
-
-
- public ServiceTestFragment( String id )
- {
- SequenceFragment testRoot = new SequenceFragment();
- Condition condition = new Condition()
- {
- public boolean evaluate()
- {
- return testService;
- }
- };
- setCondition( condition );
-
- testRoot.add( new SimpleFragment( new WebServiceTestDefaultingCommand(), "" ) );
- testRoot.add( new SimpleFragment( id ) );
- setTrueFragment( testRoot );
-
- }
-
-
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
-
- dataRegistry.addMapping(WebServiceTestDefaultingCommand.class, "TestID",WSDLTestLaunchCommand.class);
-
- //from the wizard
- dataRegistry.addMapping(ServiceTestWidget.class, "TestID",WSDLTestLaunchCommand.class);
- dataRegistry.addMapping(WebServiceTestDefaultingCommand.class, "ExternalBrowser",WSDLTestLaunchCommand.class);
- }
-
- public void setGenerateProxy(boolean generateProxy)
- {
- this.generateProxy = generateProxy;
- }
-
- public boolean getGenerateProxy()
- {
- return generateProxy;
- }
-
- /**
- * @return Returns the testService.
- */
- public void setTestService( boolean testService )
- {
- this.testService = testService;
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestWidget.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestWidget.java
deleted file mode 100644
index 4f186f1..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestWidget.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets.test;
-
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WSDLTestLaunchCommand;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionList;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.common.environment.IEnvironment;
-
-
-public class ServiceTestWidget extends SimpleWidgetDataContributor
-{
- private String createPluginId_ = "org.eclipse.jst.ws.creation.ui";
-
- private Combo testTypeCombo_;
- /*CONTEXT_ID PSTP0001 for the Test Type Combo box of the Service Test Page*/
- private final String INFOPOP_PSTP_COMBOBOX_TEST = "PSTP0001";
-
- private Button launchButton_;
- /*CONTEXT_ID PSTP0002 for the launch button of the Service Test Page*/
- private final String INFOPOP_PSTP_LAUNCH_BUTTON = "PSTP0002";
-
-
- private SelectionList facilities_;
-
- private String serviceServerInstanceId = null;
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener )
- {
- UIUtils uiUtils = new UIUtils(createPluginId_ );
-
- Composite testComposite = uiUtils.createComposite( parent, 3, 0, 0 );
-
- testTypeCombo_ = uiUtils.createCombo( testComposite, ConsumptionUIMessages.LABEL_TEST_TYPES,
- ConsumptionUIMessages.TOOLTIP_PSTP_COMBOBOX_TEST,
- INFOPOP_PSTP_COMBOBOX_TEST,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-
- launchButton_ = uiUtils.createPushButton( testComposite, ConsumptionUIMessages.BUTTON_LAUNCH_SERVICE_TEST,
- ConsumptionUIMessages.TOOLTIP_PSTP_LAUNCH_BUTTON,
- INFOPOP_PSTP_LAUNCH_BUTTON );
- launchButton_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent event )
- {
- handleLaunchButton();
- }
- });
-
-
- return this;
- }
-
- private TypeRuntimeServer serviceids;
- private String serverProject;
- private String module;
- private String wsdlURI;
- private String launchedServiceTestName = "";
- private IEnvironment env;
- private List endpoints;
-
- private void handleLaunchButton()
- {
- // Split up the project and module
- int p = serverProject.indexOf("/");
- if (p != -1){
- module = serverProject.substring(p+1);
- serverProject = serverProject.substring(0,p);
- }
-
- String testID = testTypeCombo_.getText();
- launchedServiceTestName = testID;
- WSDLTestLaunchCommand wtlc = new WSDLTestLaunchCommand();
- wtlc.setTestID(testID);
- wtlc.setServiceTypeRuntimeServer(serviceids);
- wtlc.setServiceServerInstanceId(serviceServerInstanceId);
- wtlc.setServerProject(serverProject);
- wtlc.setServerModule(module);
- wtlc.setWsdlURI(wsdlURI);
- wtlc.setExternalBrowser(true);
- wtlc.setEndpoint(endpoints);
- wtlc.setEnvironment( env );
- wtlc.execute( null, null );
- }
-
- public void setServiceTestFacilities( SelectionList facilities )
- {
- facilities_ = facilities;
- testTypeCombo_.setItems( facilities.getList() );
- testTypeCombo_.select( facilities.getIndex() );
- }
-
- public SelectionList getServiceTestFacilities()
- {
- facilities_.setIndex( testTypeCombo_.getSelectionIndex() );
- return facilities_;
- }
-
- public String getTestID()
- {
- return testTypeCombo_.getText();
- }
-
- public void setWsdlURI(String wsdlURI)
- {
- this.wsdlURI = wsdlURI;
- }
-
- public void setServerProject(String serverProject)
- {
- this.serverProject = serverProject;
- }
-
- public void setServiceTypeRuntimeServer(TypeRuntimeServer serviceids)
- {
- this.serviceids = serviceids;
- }
-
- public String getLaunchedServiceTestName()
- {
- return launchedServiceTestName;
- }
-
- public void setEnvironment(IEnvironment env)
- {
- this.env = env;
- }
-
- public void setEndpoint(String endpoint)
- {
- if (endpoint != null && endpoint.length() > 0)
- {
- Vector v = new Vector();
- v.add(endpoint);
- setEndpoints(v);
- }
- }
-
- public void setEndpoints(List endpoints)
- {
- this.endpoints = endpoints;
- }
-
- public void setServiceServerInstanceId(String ssInstanceId){
- this.serviceServerInstanceId = ssInstanceId;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/WebServiceTestDefaultingCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/WebServiceTestDefaultingCommand.java
deleted file mode 100644
index 9d1d6af..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/WebServiceTestDefaultingCommand.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 15, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.ws.internal.creation.ui.widgets.test;
-
-import java.util.Enumeration;
-import java.util.Vector;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestExtension;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionList;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-/**
- * @author gilberta
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-public class WebServiceTestDefaultingCommand extends AbstractDataModelOperation
-{
-
- private SelectionList serviceTestFacilities;
- private String[] testID;
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- ScenarioContext scenarioContext = WebServicePlugin.getInstance().getScenarioContext().copy();
- testID = scenarioContext.getNonJavaTestService();
- String[] testTypes = scenarioContext.getWebServiceTestTypes();
-
- IStatus status = Status.OK_STATUS;
- WebServiceTestRegistry wsttRegistry = WebServiceTestRegistry.getInstance();
-
-
- Vector wsdlNames = new Vector();
- for(int i =0 ;i<testTypes.length;i++){
- WebServiceTestExtension wscte = (WebServiceTestExtension)wsttRegistry.getWebServiceExtensionsByName(testTypes[i]);
- if(wscte.testWSDL()){
- wsdlNames.addElement(testTypes[i]);
- }
- }
-
- String javaNamesArray[] = new String[wsdlNames.size()];
- Enumeration e = wsdlNames.elements();
- int i = 0;
- while(e.hasMoreElements()){
- javaNamesArray[i] = (String)e.nextElement();
- i++;
- }
-
-
- serviceTestFacilities = new SelectionList(javaNamesArray,0);
-
- return status;
- }
-
- public SelectionList getServiceTestFacilities()
- {
- return serviceTestFacilities;
- }
-
- public String[] getTestID()
- {
- return testID;
- }
-
- public boolean getExternalBrowser()
- {
- return false;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/.classpath b/bundles/org.eclipse.jst.ws.jaxrs.core/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/.cvsignore b/bundles/org.eclipse.jst.ws.jaxrs.core/.cvsignore
deleted file mode 100644
index 117a1fe..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-@dot*
-temp.folder
-build.xml
-javaCompiler...args
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/.project b/bundles/org.eclipse.jst.ws.jaxrs.core/.project
deleted file mode 100644
index b7ce3be..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxrs.core</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/bundles/org.eclipse.jst.ws.jaxrs.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.jaxrs.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 0988549..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,37 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
-Bundle-SymbolicName: org.eclipse.jst.ws.jaxrs.core;singleton:=true
-Bundle-Version: 1.0.202.qualifier
-Bundle-Activator: org.eclipse.jst.ws.jaxrs.core.internal.JAXRSCorePlugin
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.100,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.5.100,4.0.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.4.100,2.0.0)",
- org.eclipse.jst.j2ee.web;bundle-version="[1.1.400,1.2.0)",
- org.eclipse.jdt.core;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.400,1.2.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.ui;bundle-version="[3.6.0,4.0.0)";resolution:=optional,
- org.eclipse.emf.ecore.xmi;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.emf.edit;bundle-version="[2.6.0,3.0.0)",
- org.eclipse.jst.common.project.facet.core;bundle-version="[1.4.100,2.0.0)",
- org.eclipse.jem.util;bundle-version="[2.1.0,3.0.0)",
- org.eclipse.wst.server.core;bundle-version="[1.1.202,2.0.0)",
- org.eclipse.jst.server.core;bundle-version="[1.2.0,2.0.0)"
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.jst.ws.jaxrs.core.internal,
- org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry;x-friends:="org.eclipse.wst.jaxrs.ui",
- org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryconfig,
- org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryproviderconfig,
- org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.adapter;x-friends:="org.eclipse.wst.jaxrs.ui",
- org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl;x-friends:="org.eclipse.wst.jaxrs.ui",
- org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.util;x-friends:="org.eclipse.wst.jaxrs.ui",
- org.eclipse.jst.ws.jaxrs.core.internal.jaxrssharedlibraryconfig,
- org.eclipse.jst.ws.jaxrs.core.internal.project.facet;x-friends:="org.eclipse.wst.jaxrs.ui",
- org.eclipse.jst.ws.jaxrs.core.jaxrsappconfig.internal,
- org.eclipse.jst.ws.jaxrs.core.jaxrslibraryconfiguration.internal,
- org.eclipse.jst.ws.jaxrs.core.jaxrslibraryregistry.internal
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Vendor: %PLUGIN_PROVIDER
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/about.html b/bundles/org.eclipse.jst.ws.jaxrs.core/about.html
deleted file mode 100644
index 4af3750..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>October, 2009</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/build.properties b/bundles/org.eclipse.jst.ws.jaxrs.core/build.properties
deleted file mode 100644
index b2ce180..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- plugin.properties,\
- schema/,\
- about.html
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/plugin.properties b/bundles/org.eclipse.jst.ws.jaxrs.core/plugin.properties
deleted file mode 100644
index d03e774..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/plugin.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2009, 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-# yyyymmdd bug Email and other contact information
-# -------- -------- -----------------------------------------------------------
-# 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
-# 20091106 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
-###############################################################################
-plugin.name=JAX-RS Tools - Core
-PLUGIN_PROVIDER=Eclipse Web Tools Platform
-plugin.facet.label=JAX-RS (REST Web Services)
-plugin.facet.description=Enables the project to be deployed with JAX-RS capabilities.
-noOpLibraryProviderWarning = Library configuration is disabled. Further classpath changes may be required later.
-noOpLibraryProviderMessage = This facet requires a JAX-RS implementation library to be present on the project classpath. By disabling library configuration, the user takes on the responsibility of configuring the classpath appropriately using alternate means.
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/plugin.xml b/bundles/org.eclipse.jst.ws.jaxrs.core/plugin.xml
deleted file mode 100644
index 1d3ef0b..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/plugin.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <extension-point id="jaxrsSharedLibrarySupport" name="jaxrsSharedLibrarySupport" schema="schema/jaxrsSharedLibrarySupport.exsd"/>
- <extension-point id="jaxrsLibraryProvider" name="jaxrsLibraryProvider" schema="schema/jaxrsLibraryProvider.exsd"/>
-
- <!-- JAXRS Project Facets -->
- <extension
- id="org.eclipse.jst.ws.jaxrs.project.facet"
- name="JAX-RS (REST Web Services)"
- point="org.eclipse.wst.common.project.facet.core.facets">
-
- <project-facet id="jst.jaxrs">
- <label>%plugin.facet.label</label>
- <description>%plugin.facet.description</description>
- <default-version
- provider="org.eclipse.jst.ws.jaxrs.core.internal.project.facet.JAXRSFacetDefaultVersionProvider">
- </default-version>
-
- </project-facet>
-
- <project-facet-version facet="jst.jaxrs" version="1.0">
- <constraint>
- <and>
- <requires facet="jst.web" version="[2.3"/>
- <requires
- facet="jst.java"
- version="[5.0">
- </requires>
-
- </and>
- </constraint>
- </project-facet-version>
-
- <project-facet-version facet="jst.jaxrs" version="1.1">
- <constraint>
- <and>
- <requires facet="jst.web" version="[2.3"/>
- <requires
- facet="jst.java"
- version="[5.0">
- </requires>
-
- </and>
- </constraint>
- </project-facet-version>
-
-
- <action id="jst.jaxrs.v10.install" facet="jst.jaxrs" type="INSTALL" version="1.0">
- <delegate class="org.eclipse.jst.ws.jaxrs.core.internal.project.facet.JAXRSFacetInstallDelegate"/>
- <config-factory class="org.eclipse.jst.ws.jaxrs.core.internal.project.facet.JAXRSFacetInstallDataModelProvider"/>
- </action>
-
- <action id="jst.jaxrs.v10.uninstall" facet="jst.jaxrs" type="UNINSTALL" version="1.0" >
- <config-factory class="org.eclipse.jst.ws.jaxrs.core.internal.project.facet.JAXRSFacetUninstallConfig$Factory"/>
- <delegate
- class="org.eclipse.jst.ws.jaxrs.core.internal.project.facet.JAXRSFacetUninstallDelegate"/>
- </action>
- <action id="jst.jaxrs.v10.vchange" facet="jst.jaxrs" type="VERSION_CHANGE" version="1.0" >
- <delegate
- class="org.eclipse.jst.ws.jaxrs.core.internal.project.facet.JAXRSFacetVersionChangeDelegate"/>
- </action>
- <action id="jst.jaxrs.v11.install" facet="jst.jaxrs" type="INSTALL" version="[1.1">
- <delegate class="org.eclipse.jst.ws.jaxrs.core.internal.project.facet.JAXRSFacetInstallDelegate"/>
- <config-factory class="org.eclipse.jst.ws.jaxrs.core.internal.project.facet.JAXRSFacetInstallDataModelProvider"/>
- </action>
-
- <action id="jst.jaxrs.v11.uninstall" facet="jst.jaxrs" type="UNINSTALL" version="[1.1" >
- <config-factory class="org.eclipse.jst.ws.jaxrs.core.internal.project.facet.JAXRSFacetUninstallConfig$Factory"/>
- <delegate
- class="org.eclipse.jst.ws.jaxrs.core.internal.project.facet.JAXRSFacetUninstallDelegate"/>
- </action>
- <action id="jst.jaxrs.v11.vchange" facet="jst.jaxrs" type="VERSION_CHANGE" version="1.1" >
- <delegate
- class="org.eclipse.jst.ws.jaxrs.core.internal.project.facet.JAXRSFacetVersionChangeDelegate"/>
- </action>
-
- </extension>
-
-
-
- <extension point="org.eclipse.wst.common.project.facet.core.runtimes">
- <supported>
- <runtime-component any="true"/>
- <facet id="jst.jaxrs" version="1.0"/>
- </supported>
- </extension>
-
- <extension point="org.eclipse.wst.common.project.facet.core.runtimes">
- <supported>
- <runtime-component any="true"/>
- <facet id="jst.jaxrs" version="1.1"/>
- </supported>
- </extension>
- <extension point="org.eclipse.jdt.core.classpathContainerInitializer">
- <classpathContainerInitializer
- class="org.eclipse.jst.ws.jaxrs.core.internal.JAXRSLibrariesContainerInitializer"
- id="org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibrarycontainer"/>
- </extension>
-
- <!--
- ******************************************
- * Library Provider Framework Integration *
- ******************************************
- -->
-
- <extension point="org.eclipse.jst.common.project.facet.core.libraryProviders">
- <provider id="jaxrs-user-library-provider" extends="wtp-user-library-provider">
- <param name="validator" value="org.eclipse.jst.ws.jaxrs.core.internal.project.facet.JAXRSLibraryValidator"/>
- <param name="validator.param.0" value="javax.ws.rs.Path"/>
- <enablement>
- <with variable="requestingProjectFacet">
- <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.jaxrs" forcePluginActivation="true"/>
- </with>
- </enablement>
- <action type="INSTALL">
- <config class="org.eclipse.jst.ws.jaxrs.core.internal.project.facet.JAXRSUserLibraryProviderInstallOperationConfig"/>
- <operation class="org.eclipse.jst.ws.jaxrs.core.internal.project.facet.JAXRSUserLibraryProviderInstallOperation"/>
- </action>
- </provider>
- </extension>
-
- <extension point="org.eclipse.jst.common.project.facet.core.libraryProviders">
- <provider id="jaxrs-no-op-library-provider" extends="no-op-library-provider">
- <param name="message" value="%noOpLibraryProviderMessage"/>
- <param name="warning" value="%noOpLibraryProviderWarning"/>
- <enablement>
- <with variable="requestingProjectFacet">
- <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.jaxrs" forcePluginActivation="true"/>
- </with>
- </enablement>
- </provider>
- </extension>
- <extension-point id="pluginProvidedJaxrsLibraries" name="pluginProvidedJaxrsLibraries" schema="schema/pluginProvidedJaxrsLibraries.exsd"/>
-
-
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/schema/jaxrsLibraryProvider.exsd b/bundles/org.eclipse.jst.ws.jaxrs.core/schema/jaxrsLibraryProvider.exsd
deleted file mode 100644
index 77fc75b..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/schema/jaxrsLibraryProvider.exsd
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.jaxrs.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.ws.jaxrs.core" id="jaxrsLibraryProvider" name="jaxrsLibraryProvider"/>
- </appInfo>
- <documentation>
- Used to provided additional information for JAX-RS facet library providers
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <appInfo>
- <meta.element />
- </appInfo>
- <documentation>
- The id of the library provider, see extension point="org.eclipse.jst.common.project.facet.core.libraryProviders"
- </documentation>
- </annotation>
- <complexType>
- <sequence>
- <element ref="jaxrsLibraryprovider" minOccurs="0" maxOccurs="1"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="jaxrsLibraryprovider">
- <complexType>
- <attribute name="libraryProviderID" type="string" use="required">
- <annotation>
- <documentation>
- The library provider id, see org.eclipse.jst.common.project.facet.core.libraryProviders
- </documentation>
- </annotation>
- </attribute>
- <attribute name="showUpdateDD" type="boolean">
- <annotation>
- <documentation>
- If value is true, show a checkbox on the JAX-RS facet wizard page to make the update of deployment descriptor optional (supports JAX-RS v1.1 development with no web.xml)
- </documentation>
- </annotation>
- </attribute>
- <attribute name="updateDDSelected" type="boolean">
- <annotation>
- <documentation>
- Only has meaning if showUpdateDD is provided, if omitted then value is false- update DD checkbox is not selected in the JAX-RS facet wizard page. If true, then update DD checkbox is selected.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="sevletClassName" type="string">
- <annotation>
- <documentation>
- The JAX-RS servlet class name to use by this library provider
- </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>
-
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/schema/jaxrsSharedLibrarySupport.exsd b/bundles/org.eclipse.jst.ws.jaxrs.core/schema/jaxrsSharedLibrarySupport.exsd
deleted file mode 100644
index 1dea15c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/schema/jaxrsSharedLibrarySupport.exsd
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.jaxrs.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.ws.jaxrs.core" id="jaxrsSharedLibrarySupport" name="jaxrsSharedLibrarySupport"/>
- </appInfo>
- <documentation>
- This extension point allows clients to add Shared Library Support for JAX-RS Applications.
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <appInfo>
- <meta.element />
- </appInfo>
- </annotation>
- <complexType>
- <sequence>
- <element ref="jaxrsSharedLibraryConfigurator" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="jaxrsSharedLibraryConfigurator">
- <complexType>
- <attribute name="jaxrsSharedLibraryConfiguratorDelegate" type="string" use="required">
- <annotation>
- <documentation>
- class that must extend org.eclipse.jst.ws.jaxrs.core.internal.jaxrssharedlibraryconfig.JAXRSSharedLibConfiguratorDelegate to supply a shared library installer and uninstaller , as well as indicate whether shared library support is available for a given project
- </documentation>
- <appInfo>
- <meta.attribute kind="java" basedOn="org.eclipse.jst.ws.jaxrs.core.internal.jaxrssharedlibraryconfig.JAXRSSharedLibConfiguratorDelegate:"/>
- </appInfo>
- </annotation>
- </attribute>
- <attribute name="isSelected" type="boolean">
- <annotation>
- <documentation>
- If shared library support is available for the project, the value indicates whether or not to add the libraries as shared libraries ( default is false )
- </documentation>
- </annotation>
- </attribute>
- <attribute name="runtimeID" type="string" use="required">
- <annotation>
- <documentation>
- The configurator is only queried if the Web Project targets this server runtime ID.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
- A name for the Configurator.
- </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>
- Value of the attribute class must be a fully qualified name of a Java class that extends the abstract class <code>org.eclipse.jst.ws.jaxrs.core.internal.jaxrssharedlibraryconfig.JAXRSSharedLibConfiguratorDelegate</code> and has a public 0-arg constructor.
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/schema/pluginProvidedJaxrsLibraries.exsd b/bundles/org.eclipse.jst.ws.jaxrs.core/schema/pluginProvidedJaxrsLibraries.exsd
deleted file mode 100644
index a891e1a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/schema/pluginProvidedJaxrsLibraries.exsd
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.jaxrs.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.ws.jaxrs.core" id="pluginProvidedJaxrsLibraries" name="JAX-RS Libraries"/>
- </appInfo>
- <documentation>
- <p><b>This extension point is deprecated, provisional and subject to change.</b></p>
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <appInfo>
- <meta.element deprecated="true" internal="true" />
- </appInfo>
- </annotation>
- <complexType>
- <sequence>
- <element ref="jaxrsLibrary" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="jaxrsLibrary">
- <annotation>
- <appInfo>
- <meta.element labelAttribute="name"/>
- </appInfo>
- <documentation>
- A named collection of jars that will be added to the classpath as a classpath container to a project that references it.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
- A unique, non-translatable, name for the library. The plugin developer is responsible for ensuring uniqueness within the plugin. This name, in combination with the plugin id, is used to identify the classpath container reference.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="label" type="string">
- <annotation>
- <documentation>
- Translatable string for displaying the library name.
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- <attribute name="archiveFilesDelegate" type="string" use="required">
- <annotation>
- <documentation>
- class that must extend org.eclipse.jst.ws.jaxrs.core.jaxrslibraryregistry.JAXRSLibraryArchiveFilesDelegate to supply a collection of IPaths to jars in the library
- </documentation>
- <appInfo>
- <meta.attribute kind="java" basedOn="org.eclipse.jst.ws.jaxrs.core.jaxrslibraryregistry.PluginProvidedJAXRSLibraryArchiveFilesDelegate:" deprecated="true"/>
- </appInfo>
- </annotation>
- </attribute>
- <attribute name="deploy" type="boolean">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
-
-
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Contributors:
-Eric D. Peters - initial API and implementation
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- Value of the attribute class must be a fully qualified name of a Java class that extends the abstract class <code>org.eclipse.jst.ws.jaxrs.core.jaxrslibraryregistry.PluginProvidedJAXRSLibraryJarFilesDelegate</code> and has a public 0-arg constructor.
- </documentation>
- </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/IJAXRSCoreConstants.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/IJAXRSCoreConstants.java
deleted file mode 100644
index 137db21..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/IJAXRSCoreConstants.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100302 304405 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS Facet : support JAX-RS 1.1 (JSR 311)
- * 20100428 310905 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS facet fails to install due to NPE or runtime exception due to duplicate cp entries
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal;
-
-/**
- * JAXRS Core framework constants
- *
- * <p>
- * <b>Provisional API - subject to change</b>
- * </p>
- *
- *
- */
-public final class IJAXRSCoreConstants {
- /**
- * The global id for the JAXRS facet
- */
- public static final String JAXRS_FACET_ID = "jst.jaxrs"; //$NON-NLS-1$
- /**
- * The facet version for a JAX-RS 1.0 project
- */
- public final static String FACET_VERSION_1_0 = "1.0"; //$NON-NLS-1$
- /**
- * The constant id for a JAXRS 1.0 project
- */
- public final static String JAXRS_VERSION_1_0 = FACET_VERSION_1_0;
- /**
- * The facet version for a JAX-RS 1.1 project
- */
- public final static String FACET_VERSION_1_1 = "1.1"; //$NON-NLS-1$
- /**
- * The constant id for a JAXRS 1.1 project
- */
- public final static String JAXRS_VERSION_1_1 = FACET_VERSION_1_1;
- public static final String NO_OP_LIBRARY_ID = "jaxrs-no-op-library-provider"; //$NON-NLS-1$
-
- private IJAXRSCoreConstants() {
- // no instantiation
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/JAXRSCorePlugin.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/JAXRSCorePlugin.java
deleted file mode 100644
index 0808c44..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/JAXRSCorePlugin.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- *******************************************************************************/package org.eclipse.jst.ws.jaxrs.core.internal;
-
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.ILog;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ui.preferences.ScopedPreferenceStore;
-import org.osgi.framework.BundleContext;
-
-/**
- * JAX-RS Core plugin.
- */
-public class JAXRSCorePlugin extends Plugin {
- /**
- * The plugin id
- */
- public static final String PLUGIN_ID = "org.eclipse.jst.ws.jaxrs.core";
- // //$NON-NLS-1$
-
- // The shared instance.
- private static JAXRSCorePlugin plugin;
-
- private IPreferenceStore preferenceStore;
-
- private static IDialogSettings jaxrsUIsettings = null;
-
- /**
- * The constructor.
- */
- public JAXRSCorePlugin() {
- plugin = this;
- }
-
- /**
- * This method is called upon plug-in activation
- *
- * @param context
- * @throws Exception
- */
- @Override
- public void start(final BundleContext context) throws Exception {
- super.start(context);
- }
-
- /**
- * This method is called when the plug-in is stopped
- *
- * @param context
- * @throws Exception
- */
- @Override
- public void stop(final BundleContext context) throws Exception {
- super.stop(context);
-
- plugin = null;
- }
-
- /**
- * Returns the shared instance.
- *
- * @return the shared instance
- */
- public static JAXRSCorePlugin getDefault() {
- return plugin;
- }
-
- /**
- * @param e
- * @param msg
- */
- public static void log(final Exception e, final String msg) {
- final ILog log = getDefault().getLog();
-
- log.log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.OK, msg, e));
- }
-
- /**
- * Logs using the default ILog implementation provided by getLog().
- *
- * @param severity
- * Severity (IStatus constant) of log entry
- * @param message
- * Human-readable message describing log entry
- * @param ex
- * Throwable instance (can be null)
- */
- public static void log(final int severity, final String message,
- final Throwable ex) {
- getDefault().getLog().log(
- new Status(severity, PLUGIN_ID, IStatus.OK, message, ex));
- }
-
- /**
- * Logs using the default ILog implementation provided by getLog().
- *
- * @param severity
- * Severity (IStatus constant) of log entry
- * @param message
- * Human-readable message describing log entry
- */
- public static void log(final int severity, final String message) {
- log(severity, message, null);
- }
-
- /**
- * Logs a message for this plugin
- *
- * @param message
- * @param t
- */
- public static void log(final String message, final Throwable t) {
- final ILog log = plugin.getLog();
- log.log(new Status(IStatus.ERROR, plugin.getBundle().getSymbolicName(),
- 0, message, t));
- }
-
- public String getPluginID() {
- return PLUGIN_ID;
- }
-
- /**
- * @return the preference store for this bundle
- */
- public IPreferenceStore getPreferenceStore() {
- // Create the preference store lazily.
- if (this.preferenceStore == null) {
- this.preferenceStore = new ScopedPreferenceStore(
- new InstanceScope(), getBundle().getSymbolicName());
-
- }
- return this.preferenceStore;
- }
-
- /**
- * @param name
- * @return the extension point called name for this bundle
- */
- public IExtensionPoint getExtension(final String name) {
- return Platform.getExtensionRegistry().getExtensionPoint(
- plugin.getBundle().getSymbolicName(), name);
- }
-
- public IDialogSettings getJaxrsUISettings() {
- return jaxrsUIsettings;
- }
-
- public void setJAXRSUIDialogSettings(IDialogSettings jaxrsUISettings) {
- if (JAXRSCorePlugin.jaxrsUIsettings == null)
- JAXRSCorePlugin.jaxrsUIsettings = jaxrsUISettings;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/JAXRSLibrariesContainerInitializer.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/JAXRSLibrariesContainerInitializer.java
deleted file mode 100644
index 052f981..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/JAXRSLibrariesContainerInitializer.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100420 309846 ericdp@ca.ibm.com - Eric D. Peters, Remove dead code related to e.p. pluginProvidedJaxrsLibraries
-
- *******************************************************************************/package org.eclipse.jst.ws.jaxrs.core.internal;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.ClasspathContainerInitializer;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibrary;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryconfig.JAXRSLibraryRegistryUtil;
-import org.eclipse.jst.ws.jaxrs.core.jaxrslibraryconfiguration.internal.JAXRSLibraryConfigurationHelper;
-
-/**
- * Initialize JAXRS Libraries as classpath containers
- * @deprecated
- *
- * <p>
- * <b>Provisional API - subject to change - do not use</b>
- * </p>
- */
-public class JAXRSLibrariesContainerInitializer extends
- ClasspathContainerInitializer {
-
- private static final String MISSING_LIBRARY = Messages.JAXRSLibrariesContainerInitializer_missing_library;
-
- /**
- * Constructor
- */
- public JAXRSLibrariesContainerInitializer() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.jdt.core.ClasspathContainerInitializer#initialize(org.eclipse
- * .core.runtime.IPath, org.eclipse.jdt.core.IJavaProject)
- */
- public void initialize(IPath containerPath, IJavaProject project)
- throws CoreException {
- if (isJAXRSLibraryContainer(containerPath)) {
- String libId = containerPath.lastSegment();
-
- JAXRSLibrary ref = JAXRSLibraryRegistryUtil.getInstance()
- .getJAXRSLibraryRegistry().getJAXRSLibraryByID(libId);
- if (ref != null) {
- JAXRSLibraryClasspathContainer container = new JAXRSLibraryClasspathContainer(
- ref);
- JavaCore.setClasspathContainer(containerPath,
- new IJavaProject[] { project },
- new IClasspathContainer[] { container }, null);
- }
- }
- }
-
- private boolean isJAXRSLibraryContainer(IPath path) {
- return path != null
- && path.segmentCount() == 2
- && JAXRSLibraryConfigurationHelper.JAXRS_LIBRARY_CP_CONTAINER_ID
- .equals(path.segment(0));
- }
-
- /*
- * (non-Javadoc)
- *
- * @seeorg.eclipse.jdt.core.ClasspathContainerInitializer#
- * canUpdateClasspathContainer(org.eclipse.core.runtime.IPath,
- * org.eclipse.jdt.core.IJavaProject)
- */
- public boolean canUpdateClasspathContainer(IPath containerPath,
- IJavaProject project) {
- return isJAXRSLibraryContainer(containerPath);
- }
-
- /**
- * @see org.eclipse.jdt.core.ClasspathContainerInitializer#getDescription(org.eclipse.core.runtime.IPath,
- * org.eclipse.jdt.core.IJavaProject)
- */
- public String getDescription(IPath containerPath, IJavaProject project) {
- if (isJAXRSLibraryContainer(containerPath)) {
- String id = containerPath.lastSegment();
- JAXRSLibrary libref = JAXRSLibraryRegistryUtil.getInstance()
- .getJAXRSLibraryRegistry().getJAXRSLibraryByID(id);
- String displayText = id;
-
- if (libref == null) {
- displayText = displayText + " " + MISSING_LIBRARY; //$NON-NLS-1$
- }
-
- return displayText;
- }
- return super.getDescription(containerPath, project);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.jdt.core.ClasspathContainerInitializer#getComparisonID(org
- * .eclipse.core.runtime.IPath, org.eclipse.jdt.core.IJavaProject)
- */
- public Object getComparisonID(IPath containerPath, IJavaProject project) {
- return containerPath;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/JAXRSLibraryClasspathContainer.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/JAXRSLibraryClasspathContainer.java
deleted file mode 100644
index 6e94f49..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/JAXRSLibraryClasspathContainer.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100420 309846 ericdp@ca.ibm.com - Eric D. Peters, Remove dead code related to e.p. pluginProvidedJaxrsLibraries
- *******************************************************************************/package org.eclipse.jst.ws.jaxrs.core.internal;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibrary;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryconfig.JAXRSLibraryRegistryUtil;
-import org.eclipse.jst.ws.jaxrs.core.jaxrslibraryconfiguration.internal.JAXRSLibraryConfigurationHelper;
-
-/**
- * JAXRS Library classpath container
- * @deprecated
- *
- * <p>
- * <b>Provisional API - subject to change - do not use</b>
- * </p>
- */
-public class JAXRSLibraryClasspathContainer implements IClasspathContainer {
- private static final String IMPL_DESC = Messages.JAXRSLibraryClasspathContainer_IMPL_LIBRARY;
-
- private JAXRSLibrary lib;
-
- /**
- * @param lib
- */
- public JAXRSLibraryClasspathContainer(JAXRSLibrary lib) {
- this.lib = lib;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.core.IClasspathContainer#getClasspathEntries()
- */
- public IClasspathEntry[] getClasspathEntries() {
- return JAXRSLibraryRegistryUtil.getInstance().getClasspathEntries(lib);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.core.IClasspathContainer#getDescription()
- */
- public String getDescription() {
- StringBuffer buf = new StringBuffer(lib.getLabel());
- buf.append(" "); //$NON-NLS-1$
- buf.append(IMPL_DESC);
-
- return buf.toString();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.core.IClasspathContainer#getKind()
- */
- public int getKind() {
- return IClasspathContainer.K_APPLICATION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.core.IClasspathContainer#getPath()
- */
- public IPath getPath() {
- return new Path(
- JAXRSLibraryConfigurationHelper.JAXRS_LIBRARY_CP_CONTAINER_ID)
- .append(this.lib.getID());
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/Messages.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/Messages.java
deleted file mode 100644
index 836f38b..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/Messages.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100413 307552 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS and Java EE 6 setup is incorrect
- * 20100519 313576 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS tools- validation problems
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * String resource handler.
- */
-public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.jst.ws.jaxrs.core.internal.messages"; //$NON-NLS-1$
-
- /**
- * see messages.properties
- */
- public static String JAXRSFacetInstallDataModelProvider_ClientImplValidationMsg;
- /**
- * see messages.properties
- */
- public static String JAXRSFacetInstallDataModelProvider_DupeJarValidation;
-
- /**
- * see messages.properties
- */
- public static String JAXRSLibrariesContainerInitializer_missing_library;
-
- /**
- * see messages.properties
- */
- public static String JAXRSLibraryClasspathContainer_IMPL_LIBRARY;
-
- /**
- * see messages.properties
- */
- public static String JAXRSLibraryConfigModel_Null_Data_Source;
-
- /**
- * see messages.properties
- */
- public static String JAXRSLibraryConfigPersistData_SAVED_COMPLIB_NOT_FOUND;
-
- /**
- * see messages.properties
- */
- public static String JAXRSLibraryConfigPersistData_SAVED_IMPLLIB_NOT_FOUND;
-
- /**
- * see messages.properties
- */
- public static String JAXRSLibraryRegistry_ErrorCreatingURL;
- /**
- * see messages.properties
- */
- public static String JAXRSLibraryRegistry_ErrorSaving;
- /**
- * see messages.properties
- */
- public static String JAXRSLibraryRegistry_DEFAULT_IMPL_LABEL;
- /**
- * see messages.properties
- */
- public static String JAXRSLibraryRegistry_ErrorLoadingFromExtPt;
-
- /**
- * see messages.properties
- */
- public static String JAXRSSharedLibraryConfigurator_ErrorLoadingFromExtPt;
- /**
- * see messages.properties
- */
- public static String JAXRSLibraryProvider_ErrorLoadingFromExtPt;
- /**
- * see messages.properties
- */
- public static String JAXRSFacetInstallDataModelProvider_ValidateServletName;
- /**
- * see messages.properties
- */
- public static String JAXRSFacetInstallDataModelProvider_ValidateServletClassName;
- /**
- * see messages.properties
- */
- public static String JAXRSFacetInstallDataModelProvider_ValidateJAXRSImpl;
- /**
- * see messages.properties
- */
- public static String ArchiveFileImpl_CannotCopyFile;
- /**
- * see messages.properties
- */
- public static String ArchiveFileImpl_CannotCloseFile;
- /**
- * see messages.properties
- */
- public static String ArchiveFileImpl_CannotLocatePluginRelativeFile;
-
- /**
- * see messages.properties
- */
- public static String PluginProvidedJAXRSLibraryCreationHelper_ErrorCreating;
-
- /**
- * see messages.properties
- */
- public static String PluginProvidedSharedLibraryConfiguratorCreationHelper_ErrorCreating;
-
- /**
- * see messages.properties
- */
- public static String JAXRSLibraryProviderCreationHelper_ErrorCreating;
-
- /**
- * see messages.properties
- */
- public static String PluginProvidedJAXRSLibraryCreationHelper_ErrorMultipleDefinition;
-
- /**
- * see messages.properties
- */
- public static String JAXRSFacetInstallDelegate_InternalErr;
- /**
- * see messages.properties
- */
- public static String JAXRSFacetInstallDelegate_ConfigErr;
- /**
- * see messages.properties
- */
- public static String JAXRSFacetInstallDelegate_NonUpdateableWebXML;
- /**
- * see messages.properties
- */
- public static String JAXRSFacetUninstallDelegate_ConfigErr;
- /**
- * see messages.properties
- */
- public static String JAXRSFacetUninstallDelegate_NonUpdateableWebXML;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrsibraryregistry/ArchiveFile.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrsibraryregistry/ArchiveFile.java
deleted file mode 100644
index 99d964f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrsibraryregistry/ArchiveFile.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100420 309846 ericdp@ca.ibm.com - Eric D. Peters, Remove dead code related to e.p. pluginProvidedJaxrsLibraries
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Archive File</b></em>'. <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.ArchiveFile#isRelativeToWorkspace
- * <em>Relative To Workspace</em>}</li>
- * <li>
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.ArchiveFile#getSourceLocation
- * <em>Source Location</em>}</li>
- * <li>
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.ArchiveFile#getRelativeDestLocation
- * <em>Relative Dest Location</em>}</li>
- * <li>
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.ArchiveFile#getJAXRSLibrary
- * <em>JAXRS Library</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistryPackage#getArchiveFile()
- * @model
- * @generated
- *
- * @deprecated
- *
- * <p>
- * <b>Provisional API - subject to change - do not use</b>
- * </p>
- */
-public interface ArchiveFile extends EObject {
- /**
- * Returns the value of the '<em><b>Source Location</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Source Location</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Source Location</em>' attribute.
- * @see #setSourceLocation(String)
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistryPackage#getArchiveFile_SourceLocation()
- * @model required="true"
- * @generated
- */
- String getSourceLocation();
-
- /**
- * Sets the value of the '
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.ArchiveFile#getSourceLocation
- * <em>Source Location</em>}' attribute. <!-- begin-user-doc --> If the
- * value passed is found to be relative to the workspace, a
- * workspace-relative location is stored; to prevent this behaviour, call
- * isRelativeToWorkspace(false) before calling this method. <!--
- * end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Source Location</em>' attribute.
- * @see #getSourceLocation()
- * @generated
- */
- void setSourceLocation(String value);
-
- /**
- * Returns the value of the '<em><b>Relative To Workspace</b></em>'
- * attribute. The default value is <code>"true"</code>. <!-- begin-user-doc
- * -->
- * <p>
- * If the meaning of the '<em>Relative To Workspace</em>' attribute isn't
- * clear, there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Relative To Workspace</em>' attribute.
- * @see #setRelativeToWorkspace(boolean)
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistryPackage#getArchiveFile_RelativeToWorkspace()
- * @model default="true" required="true"
- * @generated
- */
- boolean isRelativeToWorkspace();
-
- /**
- * Sets the value of the '
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.ArchiveFile#isRelativeToWorkspace
- * <em>Relative To Workspace</em>}' attribute. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Relative To Workspace</em>'
- * attribute.
- * @see #isRelativeToWorkspace()
- * @generated
- */
- void setRelativeToWorkspace(boolean value);
-
- /**
- * Returns the value of the '<em><b>Relative Dest Location</b></em>'
- * attribute. <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Relative Dest Location</em>' attribute isn't
- * clear, there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Relative Dest Location</em>' attribute.
- * @see #setRelativeDestLocation(String)
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistryPackage#getArchiveFile_RelativeDestLocation()
- * @model required="true"
- * @generated
- */
- String getRelativeDestLocation();
-
- /**
- * Sets the value of the '
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.ArchiveFile#getRelativeDestLocation
- * <em>Relative Dest Location</em>}' attribute. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Relative Dest Location</em>'
- * attribute.
- * @see #getRelativeDestLocation()
- * @generated
- */
- void setRelativeDestLocation(String value);
-
- /**
- * Returns the value of the '<em><b>JAXRS Library</b></em>' container
- * reference. It is bidirectional and its opposite is '
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibrary#getArchiveFiles
- * <em>Archive Files</em>}'. <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>JAXRS Library</em>' container reference isn't
- * clear, there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>JAXRS Library</em>' container reference.
- * @see #setJAXRSLibrary(JAXRSLibrary)
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistryPackage#getArchiveFile_JAXRSLibrary()
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibrary#getArchiveFiles
- * @model opposite="ArchiveFiles" required="true"
- * @generated
- */
- JAXRSLibrary getJAXRSLibrary();
-
- /**
- * Sets the value of the '
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.ArchiveFile#getJAXRSLibrary
- * <em>JAXRS Library</em>}' container reference. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>JAXRS Library</em>' container
- * reference.
- * @see #getJAXRSLibrary()
- * @generated
- */
- void setJAXRSLibrary(JAXRSLibrary value);
-
- /**
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Path</em>' attribute isn't clear, there really
- * should be more of a description here...
- * </p>
- *
- * @return the path <!-- end-user-doc -->
- * @model kind="operation" required="true"
- * @generated
- */
- String getPath();
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the name <!-- end-user-doc -->
- * @model kind="operation" required="true"
- * @generated
- */
- String getName();
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return true if exists <!-- end-user-doc -->
- * @model required="true"
- * @generated
- */
- boolean exists();
-
- /**
- * <!-- begin-user-doc -->
- *
- * @param object
- * @return true if equal <!-- end-user-doc -->
- * @model required="true" objectRequired="true"
- * @generated
- */
- boolean equals(Object object);
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the hashCode <!-- end-user-doc -->
- * @model required="true"
- * @generated
- */
- int hashCode();
-
- /**
- * <!-- begin-user-doc -->
- *
- * @param baseDestLocation
- * @return true if copied succeeds <!-- end-user-doc -->
- * @model required="true" baseDestLocationRequired="true"
- * @generated
- */
- boolean copyTo(String baseDestLocation);
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the resolved source location <!-- end-user-doc -->
- * @model kind="operation" required="true"
- * @generated
- */
- String getResolvedSourceLocation();
-
-} // ArchiveFile
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrsibraryregistry/JAXRSLibrary.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrsibraryregistry/JAXRSLibrary.java
deleted file mode 100644
index 18f2287..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrsibraryregistry/JAXRSLibrary.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100420 309846 ericdp@ca.ibm.com - Eric D. Peters, Remove dead code related to e.p. pluginProvidedJaxrsLibraries
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>JAXRS Library</b></em>'. <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.JAXRSLibrary#getID
- * <em>ID</em>}</li>
- * <li>
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.JAXRSLibrary#getName
- * <em>Name</em>}</li>
- * <li>
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.JAXRSLibrary#isDeployed
- * <em>Deployed</em>}</li>
- * <li>
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.JAXRSLibrary#getArchiveFiles
- * <em>Archive Files</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.ws.jaxrs.core.internal.JAXRSLibraryRegistryPackage#getJAXRSLibrary()
- * @model
- * @generated
- *
- * @deprecated
- *
- * <p>
- * <b>Provisional API - subject to change - do not use</b>
- * </p>
- */
-public interface JAXRSLibrary extends EObject {
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-
- /**
- * Returns the value of the '<em><b>ID</b></em>' attribute. The default
- * value is <code>""</code>. <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>ID</em>' attribute isn't clear, there really
- * should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>ID</em>' attribute.
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistryPackage#getJAXRSLibrary_ID()
- * @model default="" transient="true" changeable="false" derived="true"
- * @generated
- */
- String getID();
-
- /**
- * Returns the value of the '<em><b>Name</b></em>' attribute. <!--
- * begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Name</em>' attribute isn't clear, there really
- * should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Name</em>' attribute.
- * @see #setName(String)
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistryPackage#getJAXRSLibrary_Name()
- * @model required="true"
- * @generated
- */
- String getName();
-
- /**
- * Sets the value of the '
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibrary#getName
- * <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Name</em>' attribute.
- * @see #getName()
- * @generated
- */
- void setName(String value);
-
- /**
- * Returns the value of the '<em><b>Deployed</b></em>' attribute. The
- * default value is <code>"true"</code>. <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Deployed</em>' attribute isn't clear, there
- * really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Deployed</em>' attribute.
- * @see #setDeployed(boolean)
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistryPackage#getJAXRSLibrary_Deployed()
- * @model default="true" required="true"
- * @generated
- */
- boolean isDeployed();
-
- /**
- * Sets the value of the '
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibrary#isDeployed
- * <em>Deployed</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @param value
- * the new value of the '<em>Deployed</em>' attribute.
- * @see #isDeployed()
- * @generated
- */
- void setDeployed(boolean value);
-
- /**
- * Returns the value of the '<em><b>Archive Files</b></em>' containment
- * reference list. The list contents are of type
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.ArchiveFile}
- * . It is bidirectional and its opposite is '
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.ArchiveFile#getJAXRSLibrary
- * <em>JAXRS Library</em>}'. <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Archive Files</em>' containment reference list
- * isn't clear, there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Archive Files</em>' containment reference
- * list.
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistryPackage#getJAXRSLibrary_ArchiveFiles()
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.ArchiveFile#getJAXRSLibrary
- * @model type=
- * "org.eclipse.jst.ws.jaxrs.core.internal.JAXRSLibraryregistry.ArchiveFile"
- * opposite="JAXRSLibrary" containment="true"
- * @generated
- */
- @SuppressWarnings("unchecked")
- EList getArchiveFiles();
-
- /**
- * <!-- begin-user-doc -->
- *
- * @param fullPath
- * @return true if fullPath contains archive file <!-- end-user-doc -->
- * @model required="true" fullPathRequired="true"
- * @generated
- */
- boolean containsArchiveFile(String fullPath);
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the working copy <!-- end-user-doc -->
- * @model kind="operation" required="true"
- * @generated
- */
- JAXRSLibrary getWorkingCopy();
-
- /**
- * <!-- begin-user-doc -->
- *
- * @param otherLibrary
- * <!-- end-user-doc -->
- * @model otherLibraryRequired="true"
- * @generated
- */
- void updateValues(JAXRSLibrary otherLibrary);
-
- /**
- * <!-- begin-user-doc -->
- *
- * @param baseDestLocation
- * @return true if copy succeeds <!-- end-user-doc -->
- * @model required="true" baseDestLocationRequired="true"
- * @generated
- */
- boolean copyTo(String baseDestLocation);
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return label <!-- end-user-doc -->
- * @model kind="operation" required="true"
- * @generated
- */
- String getLabel();
-
-} // JAXRSLibrary
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrsibraryregistry/JAXRSLibraryRegistry.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrsibraryregistry/JAXRSLibraryRegistry.java
deleted file mode 100644
index 63b1793..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrsibraryregistry/JAXRSLibraryRegistry.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100420 309846 ericdp@ca.ibm.com - Eric D. Peters, Remove dead code related to e.p. pluginProvidedJaxrsLibraries
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.ws.jaxrs.core.internal.Messages;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>JAXRS Library Registry</b></em>'. <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistry#getDefaultImplementationID
- * <em>Default Implementation ID</em>}</li>
- * <li>
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistry#getJAXRSLibraries
- * <em>JAXRS Libraries</em>}</li>
- * <li>
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistry#getPluginProvidedJAXRSLibraries
- * <em>Plugin Provided JAXRS Libraries</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistryPackage#getJAXRSLibraryRegistry()
- * @model
- * @generated
- *
- * @deprecated
- *
- * <p>
- * <b>Provisional API - subject to change - do not use</b>
- * </p>
- */
- public interface JAXRSLibraryRegistry extends EObject {
- /**
- * Returns the value of the '<em><b>Default Implementation ID</b></em>'
- * attribute. The default value is <code>""</code>. <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Default Implementation ID</em>' attribute
- * isn't clear, there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Default Implementation ID</em>' attribute.
- * @see #setDefaultImplementationID(String)
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistryPackage#getJAXRSLibraryRegistry_DefaultImplementationID()
- * @model default=""
- * @generated
- */
- String getDefaultImplementationID();
-
- /**
- * Sets the value of the '
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistry#getDefaultImplementationID
- * <em>Default Implementation ID</em>}' attribute. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Default Implementation ID</em>'
- * attribute.
- * @see #getDefaultImplementationID()
- * @generated
- */
- void setDefaultImplementationID(String value);
-
- /**
- *The default implementation message string
- */
- public static final String DEFAULT_IMPL_LABEL = Messages.JAXRSLibraryRegistry_DEFAULT_IMPL_LABEL;
-
- /**
- * Returns the value of the '<em><b>JAXRS Libraries</b></em>' containment
- * reference list. The list contents are of type
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibrary}
- * . <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>JAXRS Libraries</em>' containment reference
- * list isn't clear, there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>JAXRS Libraries</em>' containment reference
- * list.
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistryPackage#getJAXRSLibraryRegistry_JAXRSLibraries()
- * @model type=
- * "org.eclipse.jst.ws.jaxrs.core.internal.JAXRSLibraryregistry.JAXRSLibrary"
- * containment="true"
- * @generated
- */
- @SuppressWarnings("unchecked")
- EList getJAXRSLibraries();
-
- /**
- * Returns the value of the '<em><b>Plugin Provided JAXRS Libraries</b></em>
- * ' containment reference list. The list contents are of type
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.PluginProvidedJAXRSLibrary}
- * . <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Plugin Provided JAXRS Libraries</em>'
- * containment reference list isn't clear, there really should be more of a
- * description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Plugin Provided JAXRS Libraries</em>'
- * containment reference list.
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistryPackage#getJAXRSLibraryRegistry_PluginProvidedJAXRSLibraries()
- * @model type="org.eclipse.jst.ws.jaxrs.core.internal.JAXRSLibraryregistry.PluginProvidedJAXRSLibrary"
- * containment="true" transient="true"
- * @generated
- */
- @SuppressWarnings("unchecked")
- EList getPluginProvidedJAXRSLibraries();
-
- /**
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Default Implementation</em>' reference isn't
- * clear, there really should be more of a description here...
- * </p>
- *
- * @return the default implementation <!-- end-user-doc -->
- * @model kind="operation" required="true"
- * @generated
- */
- JAXRSLibrary getDefaultImplementation();
-
- /**
- * <!-- begin-user-doc -->
- *
- * @param implementation
- * <!-- end-user-doc -->
- * @model implementationRequired="true"
- * @generated
- */
- void setDefaultImplementation(JAXRSLibrary implementation);
-
- /**
- * <!-- begin-user-doc -->
- *
- * @param ID
- * @return the JAXRS Library <!-- end-user-doc -->
- * @model required="true" IDRequired="true"
- * @generated
- */
- JAXRSLibrary getJAXRSLibraryByID(String ID);
-
- /**
- * <!-- begin-user-doc -->
- *
- * @param name
- * @return the jaxrs libraries matching name <!-- end-user-doc -->
- * @model required="true" many="false" nameRequired="true"
- * @generated
- */
- @SuppressWarnings("unchecked")
- EList getJAXRSLibrariesByName(String name);
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the implementation JAXRS libraries <!-- end-user-doc -->
- * @model kind="operation" required="true" many="false"
- * @generated
- */
- @SuppressWarnings("unchecked")
- EList getImplJAXRSLibraries();
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return all the JAXRS libraries <!-- end-user-doc -->
- * @model kind="operation" required="true" many="false"
- * @generated
- */
- @SuppressWarnings("unchecked")
- EList getAllJAXRSLibraries();
-
- /**
- * <!-- begin-user-doc -->
- *
- * @param library
- * @return true if add succeeds <!-- end-user-doc -->
- * @model required="true" libraryRequired="true"
- * @generated
- */
- boolean addJAXRSLibrary(JAXRSLibrary library);
-
- /**
- * <!-- begin-user-doc -->
- *
- * @param library
- * @return true if remove succeeds <!-- end-user-doc -->
- * @model required="true" libraryRequired="true"
- * @generated
- */
- boolean removeJAXRSLibrary(JAXRSLibrary library);
-
-} // JAXRSLibraryRegistry
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrsibraryregistry/JAXRSLibraryRegistryFactory.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrsibraryregistry/JAXRSLibraryRegistryFactory.java
deleted file mode 100644
index 6aee7b9..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrsibraryregistry/JAXRSLibraryRegistryFactory.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100420 309846 ericdp@ca.ibm.com - Eric D. Peters, Remove dead code related to e.p. pluginProvidedJaxrsLibraries
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a
- * create method for each non-abstract class of the model. <!-- end-user-doc -->
- *
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistryPackage
- * @generated
- *
- * @deprecated
- *
- * <p>
- * <b>Provisional API - subject to change - do not use</b>
- * </p>
- */
-public interface JAXRSLibraryRegistryFactory extends EFactory {
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-
- /**
- * The singleton instance of the factory. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- JAXRSLibraryRegistryFactory eINSTANCE = org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.JAXRSLibraryRegistryFactoryImpl
- .init();
-
- /**
- * Returns a new object of class '<em>JAXRS Library Registry</em>'. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @return a new object of class '<em>JAXRS Library Registry</em>'.
- * @generated
- */
- JAXRSLibraryRegistry createJAXRSLibraryRegistry();
-
- /**
- * Returns a new object of class '<em>JAXRS Library</em>'. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @return a new object of class '<em>JAXRS Library</em>'.
- * @generated
- */
- JAXRSLibrary createJAXRSLibrary();
-
- /**
- * Returns a new object of class '<em>Archive File</em>'. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @return a new object of class '<em>Archive File</em>'.
- * @generated
- */
- ArchiveFile createArchiveFile();
-
- /**
- * Returns a new object of class '<em>Plugin Provided JAXRS Library</em>'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return a new object of class '<em>Plugin Provided JAXRS Library</em>'.
- * @generated
- */
- PluginProvidedJAXRSLibrary createPluginProvidedJAXRSLibrary();
-
- /**
- * Returns the package supported by this factory. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the package supported by this factory.
- * @generated
- */
- JAXRSLibraryRegistryPackage getJAXRSLibraryRegistryPackage();
-
-} // JAXRSLibraryRegistryFactory
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrsibraryregistry/JAXRSLibraryRegistryPackage.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrsibraryregistry/JAXRSLibraryRegistryPackage.java
deleted file mode 100644
index 3820a71..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrsibraryregistry/JAXRSLibraryRegistryPackage.java
+++ /dev/null
@@ -1,745 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100420 309846 ericdp@ca.ibm.com - Eric D. Peters, Remove dead code related to e.p. pluginProvidedJaxrsLibraries
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc --> The <b>Package</b> for the model. It contains
- * accessors for the meta objects to represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistryFactory
- * @model kind="package"
- * @generated
- *
- *
- * @deprecated
- *
- * <p>
- * <b>Provisional API - subject to change - do not use</b>
- * </p>
- */
- public interface JAXRSLibraryRegistryPackage extends EPackage {
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- /**
- * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- String eNAME = "jaxrslibraryregistry";
-
- /**
- * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- String eNS_URI = "http://www.eclipse.org/webtools/jaxrs/schema/jaxrslibraryregistry.xsd";
-
- /**
- * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- String eNS_PREFIX = "jaxrslibreg";
-
- /**
- * The singleton instance of the package. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- JAXRSLibraryRegistryPackage eINSTANCE = org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.JAXRSLibraryRegistryPackageImpl
- .init();
-
- /**
- * The meta object id for the '
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.JAXRSLibraryRegistryImpl
- * <em>JAXRS Library Registry</em>}' class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.JAXRSLibraryRegistryImpl
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.JAXRSLibraryRegistryPackageImpl#getJAXRSLibraryRegistry()
- * @generated
- */
- int JAXRS_LIBRARY_REGISTRY = 0;
-
- /**
- * The feature id for the '<em><b>Default Implementation ID</b></em>'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int JAXRS_LIBRARY_REGISTRY__DEFAULT_IMPLEMENTATION_ID = 0;
-
- /**
- * The feature id for the '<em><b>JAXRS Libraries</b></em>' containment
- * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int JAXRS_LIBRARY_REGISTRY__JAXRS_LIBRARIES = 1;
-
- /**
- * The feature id for the '<em><b>Plugin Provided JAXRS Libraries</b></em>'
- * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int JAXRS_LIBRARY_REGISTRY__PLUGIN_PROVIDED_JAXRS_LIBRARIES = 2;
-
- /**
- * The number of structural features of the '<em>JAXRS Library Registry</em>
- * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int JAXRS_LIBRARY_REGISTRY_FEATURE_COUNT = 3;
-
- /**
- * The meta object id for the '
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.JAXRSLibraryImpl
- * <em>JAXRS Library</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.JAXRSLibraryImpl
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.JAXRSLibraryRegistryPackageImpl#getJAXRSLibrary()
- * @generated
- */
- int JAXRS_LIBRARY = 1;
-
- /**
- * The feature id for the '<em><b>ID</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int JAXRS_LIBRARY__ID = 0;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int JAXRS_LIBRARY__NAME = 1;
-
- /**
- * The feature id for the '<em><b>Deployed</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int JAXRS_LIBRARY__DEPLOYED = 2;
-
- /**
- * The feature id for the '<em><b>Archive Files</b></em>' containment
- * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int JAXRS_LIBRARY__ARCHIVE_FILES = 3;
-
- /**
- * The number of structural features of the '<em>JAXRS Library</em>' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int JAXRS_LIBRARY_FEATURE_COUNT = 6;
-
- /**
- * The meta object id for the '
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.ArchiveFileImpl
- * <em>Archive File</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.ArchiveFileImpl
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.JAXRSLibraryRegistryPackageImpl#getArchiveFile()
- * @generated
- */
- int ARCHIVE_FILE = 3;
-
- /**
- * The meta object id for the '
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.PluginProvidedJAXRSLibraryImpl
- * <em>Plugin Provided JAXRS Library</em>}' class. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.PluginProvidedJAXRSLibraryImpl
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.JAXRSLibraryRegistryPackageImpl#getPluginProvidedJAXRSLibrary()
- * @generated
- */
- int PLUGIN_PROVIDED_JAXRS_LIBRARY = 2;
-
- /**
- * The feature id for the '<em><b>ID</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PLUGIN_PROVIDED_JAXRS_LIBRARY__ID = JAXRS_LIBRARY__ID;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PLUGIN_PROVIDED_JAXRS_LIBRARY__NAME = JAXRS_LIBRARY__NAME;
-
- /**
- * The feature id for the '<em><b>Deployed</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PLUGIN_PROVIDED_JAXRS_LIBRARY__DEPLOYED = JAXRS_LIBRARY__DEPLOYED;
-
- /**
- * The feature id for the '<em><b>Archive Files</b></em>' containment
- * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PLUGIN_PROVIDED_JAXRS_LIBRARY__ARCHIVE_FILES = JAXRS_LIBRARY__ARCHIVE_FILES;
-
- /**
- * The feature id for the '<em><b>Plugin ID</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PLUGIN_PROVIDED_JAXRS_LIBRARY__PLUGIN_ID = JAXRS_LIBRARY_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Label</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PLUGIN_PROVIDED_JAXRS_LIBRARY__LABEL = JAXRS_LIBRARY_FEATURE_COUNT + 1;
-
- /**
- * The number of structural features of the '
- * <em>Plugin Provided JAXRS Library</em>' class. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PLUGIN_PROVIDED_JAXRS_LIBRARY_FEATURE_COUNT = JAXRS_LIBRARY_FEATURE_COUNT + 2;
-
- /**
- * The feature id for the '<em><b>Relative To Workspace</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int ARCHIVE_FILE__RELATIVE_TO_WORKSPACE = 0;
-
- /**
- * The feature id for the '<em><b>Source Location</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int ARCHIVE_FILE__SOURCE_LOCATION = 1;
-
- /**
- * The feature id for the '<em><b>Relative Dest Location</b></em>'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int ARCHIVE_FILE__RELATIVE_DEST_LOCATION = 2;
-
- /**
- * The feature id for the '<em><b>JAXRS Library</b></em>' container
- * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int ARCHIVE_FILE__JAXRS_LIBRARY = 3;
-
- /**
- * The number of structural features of the '<em>Archive File</em>' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int ARCHIVE_FILE_FEATURE_COUNT = 4;
-
- /**
- * Returns the meta object for class '
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistry
- * <em>JAXRS Library Registry</em>}'. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @return the meta object for class '<em>JAXRS Library Registry</em>'.
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistry
- * @generated
- */
- EClass getJAXRSLibraryRegistry();
-
- /**
- * Returns the meta object for the attribute '
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistry#getDefaultImplementationID
- * <em>Default Implementation ID</em>}'. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @return the meta object for the attribute '
- * <em>Default Implementation ID</em>'.
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistry#getDefaultImplementationID()
- * @see #getJAXRSLibraryRegistry()
- * @generated
- */
- EAttribute getJAXRSLibraryRegistry_DefaultImplementationID();
-
- /**
- * Returns the meta object for the containment reference list '
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistry#getJAXRSLibraries
- * <em>JAXRS Libraries</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the containment reference list '
- * <em>JAXRS Libraries</em>'.
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistry#getJAXRSLibraries()
- * @see #getJAXRSLibraryRegistry()
- * @generated
- */
- EReference getJAXRSLibraryRegistry_JAXRSLibraries();
-
- /**
- * Returns the meta object for the containment reference list '
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistry#getPluginProvidedJAXRSLibraries
- * <em>Plugin Provided JAXRS Libraries</em>}'. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @return the meta object for the containment reference list '
- * <em>Plugin Provided JAXRS Libraries</em>'.
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistry#getPluginProvidedJAXRSLibraries()
- * @see #getJAXRSLibraryRegistry()
- * @generated
- */
- EReference getJAXRSLibraryRegistry_PluginProvidedJAXRSLibraries();
-
- /**
- * Returns the meta object for class '
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibrary
- * <em>JAXRS Library</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>JAXRS Library</em>'.
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibrary
- * @generated
- */
- EClass getJAXRSLibrary();
-
- /**
- * Returns the meta object for the attribute '
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibrary#getID
- * <em>ID</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>ID</em>'.
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibrary#getID()
- * @see #getJAXRSLibrary()
- * @generated
- */
- EAttribute getJAXRSLibrary_ID();
-
- /**
- * Returns the meta object for the attribute '
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibrary#getName
- * <em>Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Name</em>'.
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibrary#getName()
- * @see #getJAXRSLibrary()
- * @generated
- */
- EAttribute getJAXRSLibrary_Name();
-
- /**
- * Returns the meta object for the attribute '
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibrary#isDeployed
- * <em>Deployed</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Deployed</em>'.
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibrary#isDeployed()
- * @see #getJAXRSLibrary()
- * @generated
- */
- EAttribute getJAXRSLibrary_Deployed();
-
- /**
- * Returns the meta object for the containment reference list '
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibrary#getArchiveFiles
- * <em>Archive Files</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the containment reference list '
- * <em>Archive Files</em>'.
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibrary#getArchiveFiles()
- * @see #getJAXRSLibrary()
- * @generated
- */
- EReference getJAXRSLibrary_ArchiveFiles();
-
- /**
- * Returns the meta object for class '
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.ArchiveFile
- * <em>Archive File</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>Archive File</em>'.
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.ArchiveFile
- * @generated
- */
- EClass getArchiveFile();
-
- /**
- * Returns the meta object for the attribute '
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.ArchiveFile#getSourceLocation
- * <em>Source Location</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Source Location</em>'.
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.ArchiveFile#getSourceLocation()
- * @see #getArchiveFile()
- * @generated
- */
- EAttribute getArchiveFile_SourceLocation();
-
- /**
- * Returns the meta object for the attribute '
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.ArchiveFile#isRelativeToWorkspace
- * <em>Relative To Workspace</em>}'. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Relative To Workspace</em>
- * '.
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.ArchiveFile#isRelativeToWorkspace()
- * @see #getArchiveFile()
- * @generated
- */
- EAttribute getArchiveFile_RelativeToWorkspace();
-
- /**
- * Returns the meta object for the attribute '
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.ArchiveFile#getRelativeDestLocation
- * <em>Relative Dest Location</em>}'. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @return the meta object for the attribute '
- * <em>Relative Dest Location</em>'.
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.ArchiveFile#getRelativeDestLocation()
- * @see #getArchiveFile()
- * @generated
- */
- EAttribute getArchiveFile_RelativeDestLocation();
-
- /**
- * Returns the meta object for the container reference '
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.ArchiveFile#getJAXRSLibrary
- * <em>JAXRS Library</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the container reference '
- * <em>JAXRS Library</em>'.
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.ArchiveFile#getJAXRSLibrary()
- * @see #getArchiveFile()
- * @generated
- */
- EReference getArchiveFile_JAXRSLibrary();
-
- /**
- * Returns the meta object for class '
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.PluginProvidedJAXRSLibrary
- * <em>Plugin Provided JAXRS Library</em>}'. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @return the meta object for class '<em>Plugin Provided JAXRS Library</em>
- * '.
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.PluginProvidedJAXRSLibrary
- * @generated
- */
- EClass getPluginProvidedJAXRSLibrary();
-
- /**
- * Returns the meta object for the attribute '
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.PluginProvidedJAXRSLibrary#getPluginID
- * <em>Plugin ID</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Plugin ID</em>'.
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.PluginProvidedJAXRSLibrary#getPluginID()
- * @see #getPluginProvidedJAXRSLibrary()
- * @generated
- */
- EAttribute getPluginProvidedJAXRSLibrary_PluginID();
-
- /**
- * Returns the meta object for the attribute '
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.PluginProvidedJAXRSLibrary#getLabel
- * <em>Label</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Label</em>'.
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.PluginProvidedJAXRSLibrary#getLabel()
- * @see #getPluginProvidedJAXRSLibrary()
- * @generated
- */
- EAttribute getPluginProvidedJAXRSLibrary_Label();
-
- /**
- * Returns the factory that creates the instances of the model. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the factory that creates the instances of the model.
- * @generated
- */
- JAXRSLibraryRegistryFactory getJAXRSLibraryRegistryFactory();
-
- /**
- * <!-- begin-user-doc --> Defines literals for the meta objects that
- * represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- *
- * @generated
- */
- interface Literals {
- /**
- * The meta object literal for the '
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.JAXRSLibraryRegistryImpl
- * <em>JAXRS Library Registry</em>}' class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.JAXRSLibraryRegistryImpl
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.JAXRSLibraryRegistryPackageImpl#getJAXRSLibraryRegistry()
- * @generated
- */
- // @SuppressWarnings("hiding")
- EClass JAXRS_LIBRARY_REGISTRY = eINSTANCE.getJAXRSLibraryRegistry();
-
- /**
- * The meta object literal for the '
- * <em><b>Default Implementation ID</b></em>' attribute feature. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- // @SuppressWarnings("hiding")
- EAttribute JAXRS_LIBRARY_REGISTRY__DEFAULT_IMPLEMENTATION_ID = eINSTANCE
- .getJAXRSLibraryRegistry_DefaultImplementationID();
-
- /**
- * The meta object literal for the '<em><b>JAXRS Libraries</b></em>'
- * containment reference list feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- // @SuppressWarnings("hiding")
- EReference JAXRS_LIBRARY_REGISTRY__JAXRS_LIBRARIES = eINSTANCE
- .getJAXRSLibraryRegistry_JAXRSLibraries();
-
- /**
- * The meta object literal for the '
- * <em><b>Plugin Provided JAXRS Libraries</b></em>' containment
- * reference list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- // @SuppressWarnings("hiding")
- EReference JAXRS_LIBRARY_REGISTRY__PLUGIN_PROVIDED_JAXRS_LIBRARIES = eINSTANCE
- .getJAXRSLibraryRegistry_PluginProvidedJAXRSLibraries();
-
- /**
- * The meta object literal for the '
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.JAXRSLibraryImpl
- * <em>JAXRS Library</em>}' class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.JAXRSLibraryImpl
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.JAXRSLibraryRegistryPackageImpl#getJAXRSLibrary()
- * @generated
- */
- // @SuppressWarnings("hiding")
- EClass JAXRS_LIBRARY = eINSTANCE.getJAXRSLibrary();
-
- /**
- * The meta object literal for the '<em><b>ID</b></em>' attribute
- * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- // @SuppressWarnings("hiding")
- EAttribute JAXRS_LIBRARY__ID = eINSTANCE.getJAXRSLibrary_ID();
-
- /**
- * The meta object literal for the '<em><b>Name</b></em>' attribute
- * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- // @SuppressWarnings("hiding")
- EAttribute JAXRS_LIBRARY__NAME = eINSTANCE.getJAXRSLibrary_Name();
-
- /**
- * The meta object literal for the '<em><b>Deployed</b></em>' attribute
- * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- // @SuppressWarnings("hiding")
- EAttribute JAXRS_LIBRARY__DEPLOYED = eINSTANCE
- .getJAXRSLibrary_Deployed();
-
- /**
- * The meta object literal for the '<em><b>Archive Files</b></em>'
- * containment reference list feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- // @SuppressWarnings("hiding")
- EReference JAXRS_LIBRARY__ARCHIVE_FILES = eINSTANCE
- .getJAXRSLibrary_ArchiveFiles();
-
- /**
- * The meta object literal for the '
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.ArchiveFileImpl
- * <em>Archive File</em>}' class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.ArchiveFileImpl
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.JAXRSLibraryRegistryPackageImpl#getArchiveFile()
- * @generated
- */
- // @SuppressWarnings("hiding")
- EClass ARCHIVE_FILE = eINSTANCE.getArchiveFile();
-
- /**
- * The meta object literal for the '
- * <em><b>Relative To Workspace</b></em>' attribute feature. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- // @SuppressWarnings("hiding")
- EAttribute ARCHIVE_FILE__RELATIVE_TO_WORKSPACE = eINSTANCE
- .getArchiveFile_RelativeToWorkspace();
-
- /**
- * The meta object literal for the '<em><b>Source Location</b></em>'
- * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- // @SuppressWarnings("hiding")
- EAttribute ARCHIVE_FILE__SOURCE_LOCATION = eINSTANCE
- .getArchiveFile_SourceLocation();
-
- /**
- * The meta object literal for the '
- * <em><b>Relative Dest Location</b></em>' attribute feature. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- // @SuppressWarnings("hiding")
- EAttribute ARCHIVE_FILE__RELATIVE_DEST_LOCATION = eINSTANCE
- .getArchiveFile_RelativeDestLocation();
-
- /**
- * The meta object literal for the '<em><b>JAXRS Library</b></em>'
- * container reference feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- // @SuppressWarnings("hiding")
- EReference ARCHIVE_FILE__JAXRS_LIBRARY = eINSTANCE
- .getArchiveFile_JAXRSLibrary();
-
- /**
- * The meta object literal for the '
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.PluginProvidedJAXRSLibraryImpl
- * <em>Plugin Provided JAXRS Library</em>}' class. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.PluginProvidedJAXRSLibraryImpl
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.JAXRSLibraryRegistryPackageImpl#getPluginProvidedJAXRSLibrary()
- * @generated
- */
- // @SuppressWarnings("hiding")
- EClass PLUGIN_PROVIDED_JAXRS_LIBRARY = eINSTANCE
- .getPluginProvidedJAXRSLibrary();
-
- /**
- * The meta object literal for the '<em><b>Plugin ID</b></em>' attribute
- * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- // @SuppressWarnings("hiding")
- EAttribute PLUGIN_PROVIDED_JAXRS_LIBRARY__PLUGIN_ID = eINSTANCE
- .getPluginProvidedJAXRSLibrary_PluginID();
-
- /**
- * The meta object literal for the '<em><b>Label</b></em>' attribute
- * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- // @SuppressWarnings("hiding")
- EAttribute PLUGIN_PROVIDED_JAXRS_LIBRARY__LABEL = eINSTANCE
- .getPluginProvidedJAXRSLibrary_Label();
-
- }
-
-} // JAXRSLibraryRegistryPackage
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrsibraryregistry/PluginProvidedJAXRSLibrary.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrsibraryregistry/PluginProvidedJAXRSLibrary.java
deleted file mode 100644
index 79a4340..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrsibraryregistry/PluginProvidedJAXRSLibrary.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100420 309846 ericdp@ca.ibm.com - Eric D. Peters, Remove dead code related to e.p. pluginProvidedJaxrsLibraries
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Plugin Provided JAXRS Library</b></em>'. <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.PluginProvidedJAXRSLibrary#getPluginID
- * <em>Plugin ID</em>}</li>
- * <li>
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.PluginProvidedJAXRSLibrary#getLabel
- * <em>Label</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistryPackage#getPluginProvidedJAXRSLibrary()
- * @model
- * @generated
- *
- * @deprecated
- *
- * <p>
- * <b>Provisional API - subject to change - do not use</b>
- * </p>
- */
-public interface PluginProvidedJAXRSLibrary extends JAXRSLibrary {
- /**
- * Separator between plugin id and JAXRS Library name
- */
- public static final String ID_SEPARATOR = "$$";
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- /**
- * Returns the value of the '<em><b>Plugin ID</b></em>' attribute. <!--
- * begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Plugin ID</em>' attribute isn't clear, there
- * really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Plugin ID</em>' attribute.
- * @see #setPluginID(String)
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistryPackage#getPluginProvidedJAXRSLibrary_PluginID()
- * @model required="true"
- * @generated
- */
- String getPluginID();
-
- /**
- * Sets the value of the '
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.PluginProvidedJAXRSLibrary#getPluginID
- * <em>Plugin ID</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @param value
- * the new value of the '<em>Plugin ID</em>' attribute.
- * @see #getPluginID()
- * @generated
- */
- void setPluginID(String value);
-
- /**
- * Returns the value of the '<em><b>Label</b></em>' attribute. <!--
- * begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Label</em>' attribute isn't clear, there
- * really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Label</em>' attribute.
- * @see #setLabel(String)
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistryPackage#getPluginProvidedJAXRSLibrary_Label()
- * @model required="true"
- * @generated
- */
- String getLabel();
-
- /**
- * Sets the value of the '
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.PluginProvidedJAXRSLibrary#getLabel
- * <em>Label</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Label</em>' attribute.
- * @see #getLabel()
- * @generated
- */
- void setLabel(String value);
-
-} // PluginProvidedJAXRSLibrary
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryconfig/JAXRSLibraryConfigDialogSettingData.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryconfig/JAXRSLibraryConfigDialogSettingData.java
deleted file mode 100644
index 06136f1..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryconfig/JAXRSLibraryConfigDialogSettingData.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100420 309846 ericdp@ca.ibm.com - Eric D. Peters, Remove dead code related to e.p. pluginProvidedJaxrsLibraries
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryconfig;
-
-/**
- * To construct implementation library from sticky values in DialogSettings as
- * saved libraries.
- *
- *
- * @deprecated
- *
- * <p>
- * <b>Provisional API - subject to change - do not use</b>
- * </p>
- */
-
-public class JAXRSLibraryConfigDialogSettingData implements
- JAXRSLibraryConfiglModelSource {
- /**
- * Delimintor for parsing a persistent property string.
- */
- final protected static String SEPARATOR = ":"; //$NON-NLS-1$
-
- final private JAXRSLibraryRegistryUtil jaxrsLibReg;
- final private boolean dftImplLibDeployFlag;
- final private boolean dftImplLibSharedLibFlag;
- final private boolean sharedLibSupported;
- private JAXRSLibraryInternalReference selJAXRSLibImpl; // lazy initialized
-
- public JAXRSLibraryConfigDialogSettingData(boolean implLibDeployFlag, boolean implLibSharedLibFlag, boolean sharedLibSupported) {
- this.jaxrsLibReg = JAXRSLibraryRegistryUtil.getInstance();
- this.dftImplLibDeployFlag = implLibDeployFlag;
- this.dftImplLibSharedLibFlag = implLibSharedLibFlag;
- this.sharedLibSupported = sharedLibSupported;
- }
-
- /**
- * There is no saved JAXRSImplLibrary per se if initializing from
- * DialogSettings since default implementation library is always selected
- *
- * A null is returned when there is no default implementation library in
- * registry.
- *
- * @return selJAXRSLibImpl JAXRSLibraryInternalReference return default
- * implementation library with updated deployment flag
- */
- public JAXRSLibraryInternalReference getJAXRSImplementationLibrary() {
- if (selJAXRSLibImpl == null) {
- // To instansiate a JAXRSLibraryReferenceUserSpecified object from
- // default impl lib as the saved library.
- JAXRSLibraryInternalReference dftImplLib = jaxrsLibReg
- .getDefaultJAXRSImplementationLibrary();
- if (dftImplLib != null) {
- selJAXRSLibImpl = new JAXRSLibraryInternalReference(dftImplLib
- .getLibrary(), true, // selected
- dftImplLibDeployFlag, dftImplLibSharedLibFlag);
- selJAXRSLibImpl.setSharedLibSupported(sharedLibSupported);
- }
-
- }
- return selJAXRSLibImpl;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryconfig/JAXRSLibraryConfigModel.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryconfig/JAXRSLibraryConfigModel.java
deleted file mode 100644
index 675b4ff..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryconfig/JAXRSLibraryConfigModel.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100407 308401 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS facet wizard page - Shared-library option should be disabled
- * 20100420 309846 ericdp@ca.ibm.com - Eric D. Peters, Remove dead code related to e.p. pluginProvidedJaxrsLibraries
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryconfig;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.ws.jaxrs.core.internal.Messages;
-
-/**
- * Model for the custom control <b>JAXRSLibraryConfigControl</b>. A
- * JAXRSLibraryConfigModel object is initialized from a source and updated with
- * selected implementation when selections are changed.
- *
- *
- * @deprecated
- *
- * <p>
- * <b>Provisional API - subject to change - do not use</b>
- * </p>
- */
-
-public class JAXRSLibraryConfigModel {
- final private JAXRSLibraryConfiglModelSource data;
- final private JAXRSLibraryRegistryUtil jaxrsLibReg;
- @SuppressWarnings("unchecked")
- private List colJAXRSImplLib;
-
- /**
- * Private constructor.
- *
- * @param data
- */
- private JAXRSLibraryConfigModel(JAXRSLibraryConfiglModelSource data) {
- this.data = data;
- this.jaxrsLibReg = JAXRSLibraryRegistryUtil.getInstance();
- }
-
- /**
- * Return JAXRS implementation libraries.
- *
- * This list is initialized from JAXRS Library registry and updated with
- * persistent configuration data.
- *
- * @return List
- *
- * @see org.eclipse.jst.ws.jaxrs.ui.properties.IJAXRSLibraryDecoratorProvider#getProjectJAXRSImplementationLibraries()
- */
- @SuppressWarnings("unchecked")
- public List getJAXRSImplementationLibraries() {
- if (colJAXRSImplLib == null) {
- /*
- * To initialze an implementation library list from registry and
- * then update the list with saved implementation library.
- */
- colJAXRSImplLib = jaxrsLibReg.getJAXRSImplementationLibraries();
- JAXRSLibraryInternalReference targetLib = data
- .getJAXRSImplementationLibrary();
- if (targetLib == null) {
- // no saved implementation, get default implementation library
- targetLib = jaxrsLibReg.getDefaultJAXRSImplementationLibrary();
- }
- if (targetLib != null) {
- JAXRSLibraryInternalReference srcLib = jaxrsLibReg
- .getJAXRSLibraryReferencebyID(targetLib.getID());
- if (srcLib != null) {
- srcLib.setSelected(true);
- srcLib.setToBeDeployed(targetLib.isCheckedToBeDeployed());
- srcLib.setToBeSharedLibrary(targetLib.isSharedLibSupported() && targetLib.isCheckedToBeSharedLibrary());
- srcLib.setSharedLibSupported(targetLib.isSharedLibSupported());
- }
- }
- }
- return colJAXRSImplLib;
- }
-
- /**
- * Return the selected JAXRS implementation library currently. A null is
- * returned if none is selected.
- *
- * @return JAXRSLibraryInternalReference
- */
- @SuppressWarnings("unchecked")
- public JAXRSLibraryInternalReference getCurrentJAXRSImplementationLibrarySelection() {
- Iterator it = getJAXRSImplementationLibraries().iterator();
- JAXRSLibraryInternalReference crtItem = null;
- while (it.hasNext()) {
- crtItem = (JAXRSLibraryInternalReference) it.next();
- if (crtItem.isSelected()) {
- return crtItem;
- }
- }
- return null;
- }
-
- /**
- * Returned a saved implementation library which was persisted as
- * DialogSettings or as project properties.
- *
- * @return JAXRSLibraryInternalReference
- */
- public JAXRSLibraryInternalReference getSavedJAXRSImplementationLibrary() {
- return data.getJAXRSImplementationLibrary();
- }
-
- /**
- * Update the selected JAXRS implementation library.
- *
- * Note: The library parameter won't be not added into the collection if it
- * does not exist already.
- *
- * @param library
- * JAXRSLibraryInternalReference
- */
- @SuppressWarnings("unchecked")
- public void setCurrentJAXRSImplementationLibrarySelection(
- final JAXRSLibraryInternalReference library) {
- if (library != null) {
- Iterator it = getJAXRSImplementationLibraries().iterator();
- JAXRSLibraryInternalReference crtjaxrslib = null;
- while (it.hasNext()) {
- crtjaxrslib = (JAXRSLibraryInternalReference) it.next();
- if (crtjaxrslib.getID().equals(library.getID())) {
- crtjaxrslib.setSelected(true);
- crtjaxrslib
- .setToBeDeployed(library.isCheckedToBeDeployed());
- crtjaxrslib.setToBeSharedLibrary(library.isSharedLibSupported() && library.isCheckedToBeSharedLibrary());
- crtjaxrslib.setSharedLibSupported(library.isSharedLibSupported());
- } else {
- crtjaxrslib.setSelected(false);
- }
- }
- }
- }
-
- /**
- * To save current configuration of implementation libraries as project
- * properties.
- *
- * @param project
- * IProject
- */
- public void saveData(final IProject project) {
- // Instantiate one to make sure it is for a project.
- JAXRSLibraryConfigProjectData data_ = new JAXRSLibraryConfigProjectData(
- project);
- List<JAXRSLibraryInternalReference> implLibs = new ArrayList<JAXRSLibraryInternalReference>();
- implLibs.add(getCurrentJAXRSImplementationLibrarySelection());
- data_.saveData(implLibs);
- }
-
- /**
- * Factory class to create new JAXRSLibraryConfigModel instances
- */
- public static final class JAXRSLibraryConfigModelFactory {
- /**
- * To create a new instance of JAXRSLibraryConfigModel object. A
- * NullPointerException is raised if source is null.
- *
- * @param source
- * JAXRSLibraryConfiglModelSource
- * @return JAXRSLibraryConfigModel
- */
- public static JAXRSLibraryConfigModel createInstance(
- final JAXRSLibraryConfiglModelSource source) {
- if (source == null) {
- throw new NullPointerException(
- Messages.JAXRSLibraryConfigModel_Null_Data_Source);
- }
- return new JAXRSLibraryConfigModel(source);
- }
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryconfig/JAXRSLibraryConfigProjectData.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryconfig/JAXRSLibraryConfigProjectData.java
deleted file mode 100644
index 92f5780..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryconfig/JAXRSLibraryConfigProjectData.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100420 309846 ericdp@ca.ibm.com - Eric D. Peters, Remove dead code related to e.p. pluginProvidedJaxrsLibraries
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryconfig;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.jst.ws.jaxrs.core.internal.JAXRSCorePlugin;
-import org.eclipse.jst.ws.jaxrs.core.internal.Messages;
-import org.eclipse.jst.ws.jaxrs.core.internal.project.facet.JAXRSUtils;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * To construct implementation library from persistent project properties as
- * saved libraries.
- *
- *
- * @deprecated
- *
- * <p>
- * <b>Provisional API - subject to change - do not use</b>
- * </p>
- */
-
-public class JAXRSLibraryConfigProjectData implements
- JAXRSLibraryConfiglModelSource {
- final static String QUALIFIEDNAME = "org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryconfig.JAXRSLibraryConfigProjectData";
- /**
- * Parsing delimiter for elements in a tuple.
- */
- final protected static String SPTR_TUPLE = ":"; //$NON-NLS-1$
- /**
- * Parsing delimiter for tuples in a persistent property string.
- */
- final protected static String EO_TUPLE = ";"; //$NON-NLS-1$
-
- final private IProject project;
- final private JAXRSLibraryRegistryUtil jaxrsLibReg;
- private JAXRSLibraryInternalReference selJAXRSLibImpl;
-
- /**
- * Constructor
- *
- * @param project
- */
- public JAXRSLibraryConfigProjectData(IProject project) {
- this.project = project;
- this.jaxrsLibReg = JAXRSLibraryRegistryUtil.getInstance();
-
- /*
- * logging message when object is instantiated instead of at method call
- * to reduce log entries.
- */
- if (!isProjectFirstCreated()) {
- verifySavedLibAvailability();
- }
- }
-
- /**
- * Return the previously selected JAXRS implementation library from project
- * persistent properties. Return null if none exists.
- *
- * @return selJAXRSLibImpl JAXRSLibraryDecorator
- */
- public JAXRSLibraryInternalReference getJAXRSImplementationLibrary() {
- try {
- if (!isProjectFirstCreated() && selJAXRSLibImpl == null) {
- String strImplLibs = ((IResource) project)
- .getPersistentProperty(new QualifiedName(QUALIFIEDNAME,
- JAXRSUtils.PP_JAXRS_IMPLEMENTATION_LIBRARIES));
- selJAXRSLibImpl = getJAXRSImplLibfromPersistentProperties(getTuples(strImplLibs));
- }
- } catch (CoreException e) {
- JAXRSCorePlugin
- .log(
- e,
- "Exception occured while returning reference to the JAXRS implementation library");
- }
- return selJAXRSLibImpl;
- }
-
- /**
- * To save configuration data as a project persistent properties.
- *
- * @param implementation
- * @param component
- */
- @SuppressWarnings("unchecked")
- void saveData(final List implementation) {
- try {
- ((IResource) project).setPersistentProperty(
- new QualifiedName(QUALIFIEDNAME,
- JAXRSUtils.PP_JAXRS_IMPLEMENTATION_LIBRARIES),
- generatePersistString(implementation));
-
- /*
- * Flush the selection so that they can be reconstructed from
- * persistent properties when getSavedJAXRSImplLib and
- * getSavedJAXRSCompLibs called next time.
- */
- selJAXRSLibImpl = null;
-
- } catch (CoreException e) {
- JAXRSCorePlugin
- .log(e,
- "Exception occured while persisting the JAXRS Library preferences");
- }
- }
-
- /**
- * Check if a project is just created by inspecting persistent properties if
- * there is any. ?
- */
- private boolean isProjectFirstCreated() {
- boolean isNew = false;
- try {
- ((IResource) project)
- .getPersistentProperty(new QualifiedName(QUALIFIEDNAME,
- JAXRSUtils.PP_JAXRS_IMPLEMENTATION_LIBRARIES));
- } catch (CoreException e) {
- isNew = true;
- }
- return isNew;
- }
-
- private void verifySavedLibAvailability() {
- try {
- String strImplLibs = ((IResource) project)
- .getPersistentProperty(new QualifiedName(QUALIFIEDNAME,
- JAXRSUtils.PP_JAXRS_IMPLEMENTATION_LIBRARIES));
-
- logMissingLib(getTuples(strImplLibs), true);
-
- } catch (CoreException e) {
- JAXRSCorePlugin
- .log(e,
- "Exception occured while verifying saved JAXRS Library preferences");
- }
- }
-
- private void logMissingLib(final List<Tuple> jaxrsLibTuples,
- final boolean isVerifyImpl) {
- if (jaxrsLibReg != null) {
- Iterator<Tuple> itTuple = jaxrsLibTuples.iterator();
- while (itTuple.hasNext()) {
- Tuple tuple = itTuple.next();
- JAXRSLibraryInternalReference jaxrsLib = jaxrsLibReg
- .getJAXRSLibraryReferencebyID(tuple.getID());
- /*
- * Information logged when saved JAXRS lib is removed from
- * registry. One log entry is created for each missing library.
- */
- if (jaxrsLib == null) {
- String prjName = project.getName();
- String msg = (isVerifyImpl) ? Messages.JAXRSLibraryConfigPersistData_SAVED_IMPLLIB_NOT_FOUND
- : Messages.JAXRSLibraryConfigPersistData_SAVED_COMPLIB_NOT_FOUND;
- JAXRSCorePlugin.log(IStatus.INFO, NLS.bind(msg, prjName));
- }
- }
- }
- }
-
- private JAXRSLibraryInternalReference getJAXRSImplLibfromPersistentProperties(
- final List<Tuple> jaxrsLibTuples) {
- if (jaxrsLibReg != null) {
- Tuple tuple = null;
- JAXRSLibraryInternalReference lib = null;
- Iterator<Tuple> itTuple = jaxrsLibTuples.iterator();
- while (itTuple.hasNext()) {
- tuple = itTuple.next();
- lib = jaxrsLibReg.getJAXRSLibraryReferencebyID(tuple.id);
- if (lib != null) {
- return new JAXRSLibraryInternalReference(lib.getLibrary(),
- tuple.selected, tuple.deploy, tuple.sharedLib);
- } /*
- * else { // already logged a message for a missing library }
- */
- }
- }
- return null;
- }
-
- @SuppressWarnings("unchecked")
- private String generatePersistString(List list) {
- JAXRSLibraryInternalReference jaxrsLibItem;
- StringBuffer sb = new StringBuffer();
- for (int i = 0; i < list.size(); i++) {
- jaxrsLibItem = (JAXRSLibraryInternalReference) list.get(i);
- sb = sb.append(jaxrsLibItem.generatePersistString());
- sb.append(JAXRSLibraryConfigProjectData.EO_TUPLE);
- }
- return sb.toString();
- }
-
- private List<Tuple> getTuples(String strJAXRSLibs) {
- List<Tuple> list = new ArrayList<Tuple>();
-
- if (strJAXRSLibs != null) {
- String patternStr = JAXRSLibraryConfigProjectData.EO_TUPLE;
- String[] fields = strJAXRSLibs.split(patternStr);
- if (strJAXRSLibs.length() > 0) {
- Tuple tuple;
- for (int i = 0; i < fields.length; i++) {
- tuple = new Tuple(fields[i]);
- list.add(tuple);
- }
- }
- }
- return list;
- }
-
- /**
- * Inner class for parsing project persistent properties.
- *
- * To Do: Take out selected attribute since it is not needed. Add the
- * library name as an attribute. Provide code path to migrate earlier
- * project.
- *
- * NOTE: this class should no longer be used except to support legacy
- * library registries
- */
- static class Tuple {
- final private String id;
- final private boolean selected;
- final private boolean deploy;
- final private boolean sharedLib;
-
- Tuple(String id, boolean selected, boolean deploy, boolean sharedLib) {
- this.id = id;
- this.selected = selected;
- this.deploy = deploy;
- this.sharedLib = sharedLib;
- }
-
- // parse tuple = ID:selected:deploy
- Tuple(String tuple) {
- String[] fields = tuple
- .split(JAXRSLibraryConfigProjectData.SPTR_TUPLE);
-
- if (fields.length >= 4) {
- this.id = fields[0];
- this.selected = Boolean.valueOf(fields[1]).booleanValue();
- this.deploy = Boolean.valueOf(fields[2]).booleanValue();
- this.sharedLib = Boolean.valueOf(fields[3]).booleanValue();
- } else {
- throw new IllegalStateException("Library registry is corrupt");
- }
- }
-
- String getID() {
- return id;
- }
-
- boolean isSelected() {
- return selected;
- }
-
- boolean needDeploy() {
- return deploy;
- }
- boolean needSharedLib() {
- return sharedLib;
- }
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryconfig/JAXRSLibraryConfiglModelSource.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryconfig/JAXRSLibraryConfiglModelSource.java
deleted file mode 100644
index a87d3d4..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryconfig/JAXRSLibraryConfiglModelSource.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100420 309846 ericdp@ca.ibm.com - Eric D. Peters, Remove dead code related to e.p. pluginProvidedJaxrsLibraries
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryconfig;
-
-/**
- * Interface for data source to instanciate a <b>JAXRSLibraryConfigModel</b>
- * object.
- *
- *
- * @deprecated
- *
- * <p>
- * <b>Provisional API - subject to change - do not use</b>
- * </p>
- */
-
-public interface JAXRSLibraryConfiglModelSource {
- /**
- * Return a saved JAXRS implementation library. Depends on the model source,
- * it could be sticky values from DialogSettings or project property values.
- *
- * A null could be returned when creating first web project in a new
- * workspace.
- *
- * @return JAXRSLibraryInternalReference
- */
- public JAXRSLibraryInternalReference getJAXRSImplementationLibrary();
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryconfig/JAXRSLibraryInternalReference.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryconfig/JAXRSLibraryInternalReference.java
deleted file mode 100644
index cad96f5..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryconfig/JAXRSLibraryInternalReference.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100420 309846 ericdp@ca.ibm.com - Eric D. Peters, Remove dead code related to e.p. pluginProvidedJaxrsLibraries
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryconfig;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibrary;
-
-/**
- * Attach additional attributes such as selection and deployment to a JAXRS
- * Library when it is referenced by a project.
- *
- * @deprecated
- *
- * <p>
- * <b>Provisional API - subject to change - do not use</b>
- * </p>
- */
-public class JAXRSLibraryInternalReference {
- final private JAXRSLibrary jaxrsLib;
- private boolean check4Deploy; // Initialized from default in workspace
- private boolean check4SharedLib; // Initialized from default in workspace
- private boolean selected; // selected for project
- private boolean sharedLibSupported = false;
-
- public boolean isSharedLibSupported() {
- return sharedLibSupported;
- }
-
- public void setSharedLibSupported(boolean sharedLibSupported) {
- this.sharedLibSupported = sharedLibSupported;
- }
-
- /**
- * Constructor
- *
- * @param jaxrsLib
- * JAXRSLibrary instance embedded inside.
- * @param selected
- * boolean true if selected, otherwise, not selected.
- * @param deploy
- * boolean true if needs to be deployed, otherwise, won't be
- * deployed.
- */
- public JAXRSLibraryInternalReference(JAXRSLibrary jaxrsLib,
- boolean selected, boolean deploy, boolean sharedLib) {
- this.jaxrsLib = jaxrsLib;
- this.selected = selected;
- this.check4Deploy = deploy;
- this.check4SharedLib = sharedLib;
- }
-
- /**
- * Return the embedded JAXRSLibrary instance.
- *
- * @return jaxrsLib JAXRSLibrary
- */
- public JAXRSLibrary getLibrary() {
- return jaxrsLib;
- }
-
- /**
- * Set the to be deployed flag.
- *
- * @param deploy
- * boolean
- */
- public void setToBeDeployed(final boolean deploy) {
- check4Deploy = deploy;
- }
-
- /**
- * Set the to be shared library flag.
- *
- * @param deploy
- * boolean
- */
- public void setToBeSharedLibrary(final boolean sharedLib) {
- check4SharedLib = sharedLib;
- }
-
- /**
- * Return true if the JAXRS Library needs to be deployed. Otherwise, return
- * false.
- *
- * @return boolean
- */
- public boolean isCheckedToBeDeployed() {
- return check4Deploy;
- }
- /**
- * Return true if the JAXRS Library needs to be added to the project as a shared library.
- * Otherwise, return false.
- *
- * @return boolean
- */
- public boolean isCheckedToBeSharedLibrary() {
- return check4SharedLib;
- }
-
- /**
- * Set the selected attribute to a JAXRSLibraryLibraryReference object.
- *
- * @param selected
- * boolean
- */
- public void setSelected(final boolean selected) {
- this.selected = selected;
- }
-
- /**
- * Return true if the JAXRS Library is referenced by a project. Otherwise,
- * return false.
- *
- * @return selected boolean
- */
- public boolean isSelected() {
- return selected;
- }
-
- /**
- * To generate a string that represents the JAXRSLibraryLibraryReference
- * object for persistence.
- *
- * @return String
- */
- protected String generatePersistString() {
- return (getID() + JAXRSLibraryConfigProjectData.SPTR_TUPLE
- + String.valueOf(isSelected())
- + JAXRSLibraryConfigProjectData.SPTR_TUPLE + String
- .valueOf(isCheckedToBeDeployed()));
- }
-
- /**
- * Helper method to return the library ID from the embedded JAXRSLibrary
- * instance.
- *
- * @return id String
- */
- public String getID() {
- return jaxrsLib.getID();
- }
-
- /**
- * Helper method to return the library name from the embedded JAXRSLibrary
- * instance.
- *
- * @return name String
- */
- public String getName() {
- return jaxrsLib.getName();
- }
-
- /**
- * Helper method to return the label for the library from the embedded
- * JAXRSLibrary instance.
- *
- * @return name String
- */
- public String getLabel() {
- return jaxrsLib.getLabel();
- }
-
- /**
- * Help method to return a list of Archive files from the embedded
- * JAXRSLibrary instance.
- *
- * @return boolean
- */
- @SuppressWarnings("unchecked")
- public EList getArchiveFiles() {
- return jaxrsLib.getArchiveFiles();
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryconfig/JAXRSLibraryRegistryUtil.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryconfig/JAXRSLibraryRegistryUtil.java
deleted file mode 100644
index dae0a9e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryconfig/JAXRSLibraryRegistryUtil.java
+++ /dev/null
@@ -1,544 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100304 304732 ericdp@ca.ibm.com - Eric D. Peters, NPE loading library extensions
- * 20100407 308401 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS facet wizard page - Shared-library option should be disabled
- * 20100420 309846 ericdp@ca.ibm.com - Eric D. Peters, Remove dead code related to e.p. pluginProvidedJaxrsLibraries
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryconfig;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.InvalidRegistryObjectException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxrs.core.internal.JAXRSCorePlugin;
-import org.eclipse.jst.ws.jaxrs.core.internal.JAXRSLibraryClasspathContainer;
-import org.eclipse.jst.ws.jaxrs.core.internal.Messages;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.ArchiveFile;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibrary;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistry;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistryFactory;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.adapter.MaintainDefaultImplementationAdapter;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.JAXRSLibraryRegistryPackageImpl;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.util.JAXRSLibraryRegistryResourceFactoryImpl;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.util.JAXRSLibraryRegistryResourceImpl;
-import org.eclipse.jst.ws.jaxrs.core.jaxrslibraryconfiguration.internal.JAXRSLibraryConfigurationHelper;
-import org.eclipse.jst.ws.jaxrs.core.jaxrslibraryregistry.internal.PluginProvidedJAXRSLibraryCreationHelper2;
-
-/**
- * A singleton maintains lists of implementation libraries in registry.
- *
- * Each item in the lists contains a workingcopy of a JAX-RS library and
- * decorates with usage information such selection and deployment.
- *
- * The lists are updated when there are changes in JAX-RS library registry.
- *
- */
-public class JAXRSLibraryRegistryUtil {
- private static JAXRSLibraryRegistryUtil instance = null;
-
- private List<JAXRSLibraryInternalReference> implLibs = null;
-
- // The NS URI of the JAX-RS Library Registry's Ecore package. (Must match
- // setting on package in Ecore model.)
- private static final String JAXRS_LIBRARY_REGISTRY_NSURI = "http://www.eclipse.org/webtools/jaxrs/schema/jaxrslibraryregistry.xsd"; //$NON-NLS-1$
-
- private static final String LIB_EXT_PT = "pluginProvidedJaxrsLibraries"; //$NON-NLS-1$
-
- // The JAX-RS Library Registry EMF resource instance.
- private static JAXRSLibraryRegistryResourceImpl JAXRSLibraryRegistryResource = null;
-
- // JAXRSLibraryRegistry singleton
- private JAXRSLibraryRegistry JAXRSLibraryRegistry;
-
- /**
- * Private constructor
- */
- private JAXRSLibraryRegistryUtil() {
- // nothing to do
- }
-
- /**
- * Return the singleton instance of JAXRSLibraryRegistryUtil.
- *
- * @return JAXRSLibraryRegistryUtil
- */
- public synchronized static JAXRSLibraryRegistryUtil getInstance() {
- if (instance == null) {
- instance = new JAXRSLibraryRegistryUtil();
- instance.loadJAXRSLibraryRegistry();
- }
- return instance;
- }
-
- /**
- * Convenience method to return the JAXRSLibraryRegistry instance.
- *
- * @return jaxrsLibReg JAXRSLibraryRegistry
- */
- public JAXRSLibraryRegistry getJAXRSLibraryRegistry() {
- return JAXRSLibraryRegistry;
- }
-
- /**
- * Get the default JAXRS implementation library instance. A null is returned
- * when there is no libraries in the registry.
- *
- * @return JAXRSLibraryInternalReference
- */
- public JAXRSLibraryInternalReference getDefaultJAXRSImplementationLibrary() {
- JAXRSLibrary dftImplLib = getJAXRSLibraryRegistry()
- .getDefaultImplementation();
-
- return ((dftImplLib != null) ? getJAXRSLibraryReferencebyID(dftImplLib
- .getID()) : null);
- }
-
- /**
- * Get the working copy of JAXRS implementation libraries. The list is
- * updated when there are changes in registry.
- *
- * @return List
- */
- List<JAXRSLibraryInternalReference> getJAXRSImplementationLibraries() {
- if (implLibs == null) {
- implLibs = wrapJAXRSLibraries(getJAXRSLibraryRegistry()
- .getImplJAXRSLibraries());
- } else {
- if (implLibs.size() != getJAXRSLibraryRegistry()
- .getImplJAXRSLibraries().size()
- || isAnyLibraryChanged(implLibs)) {
- implLibs.clear();
- implLibs = wrapJAXRSLibraries(getJAXRSLibraryRegistry()
- .getImplJAXRSLibraries());
- }
- }
- return implLibs;
- }
-
- /**
- * Get the JAXRSLibraryDecorator object from the provided ID. A null is
- * returned no library matches the ID.
- *
- * @param id
- * String
- * @return JAXRSLibraryDecorator
- */
- public JAXRSLibraryInternalReference getJAXRSLibraryReferencebyID(
- final String id) {
- Iterator<JAXRSLibraryInternalReference> it = getJAXRSImplementationLibraries()
- .iterator();
- JAXRSLibraryInternalReference crtItem = null;
-
- // search implementation libraries
- while (it.hasNext()) {
- crtItem = it.next();
- if (id.equals(crtItem.getID())) {
- return crtItem;
- }
- }
- return null;
- }
-
- /**
- * Add a JAXRS Library into collection for either JAXRS implementation
- * libraries. The decision is based on if a JAXRS Library is an
- * implementation.
- *
- * @param library
- * JAXRSLibraryLibraryReference
- */
- public void addJAXRSLibrary(final JAXRSLibraryInternalReference library) {
- // Library is added only if it does not exist in registry
- if (library != null
- && getJAXRSLibraryRegistry().getJAXRSLibraryByID(
- library.getID()) == null) {
- // Add the library working copy into workspace registry.
- JAXRSLibrary jaxrsLib = library.getLibrary();
- getJAXRSLibraryRegistry()
- .addJAXRSLibrary(jaxrsLib.getWorkingCopy());
-
- // Add library into the collection depends on its type.
- List<JAXRSLibraryInternalReference> list = getJAXRSImplementationLibraries();
- list.add(library);
- }
- }
-
- @SuppressWarnings("unchecked")
- private List<JAXRSLibraryInternalReference> wrapJAXRSLibraries(
- final EList libs) {
- List<JAXRSLibraryInternalReference> list = new ArrayList<JAXRSLibraryInternalReference>();
- if (libs != null) {
- JAXRSLibrary jaxrsLib;
- JAXRSLibraryInternalReference jaxrsLibDctr;
-
- Iterator it = libs.iterator();
- while (it.hasNext()) {
- jaxrsLib = (JAXRSLibrary) it.next();
- // Set selected , deployed , unshared initially
- jaxrsLibDctr = new JAXRSLibraryInternalReference(jaxrsLib,
- true, true, false);
- list.add(jaxrsLibDctr);
- }
- }
- return list;
- }
-
- private boolean isAnyLibraryChanged(
- final List<JAXRSLibraryInternalReference> list) {
- Iterator<JAXRSLibraryInternalReference> it = list.iterator();
- JAXRSLibraryInternalReference wclib = null; // working copy library
- JAXRSLibrary lib = null;
-
- while (it.hasNext()) {
- wclib = it.next();
- lib = getJAXRSLibraryRegistry().getJAXRSLibraryByID(wclib.getID());
- if (lib == null) { // removed. Hence, changed.
- return true;
- }
- if (wclib.getArchiveFiles().size() != lib.getArchiveFiles().size()) { // Archives
- // changed..
- return true;
- }
- if (isAnyArchiveFileChanged(wclib.getArchiveFiles(), lib
- .getArchiveFiles())) { // Check archive file changes. I.e.,
- // name and location
- return true;
- }
- }
- return false;
- }
-
- @SuppressWarnings("unchecked")
- private boolean isAnyArchiveFileChanged(final EList source, EList target) {
- ArchiveFile arSrc = null;
- Iterator it = source.iterator();
- while (it.hasNext()) {
- arSrc = (ArchiveFile) it.next();
- if (!findMatchedArchive(arSrc, target)) {
- return true;
- }
- }
- return false;
- }
-
- @SuppressWarnings("unchecked")
- private boolean findMatchedArchive(ArchiveFile source, EList list) {
- ArchiveFile target = null;
- Iterator it = list.iterator();
- while (it.hasNext()) {
- target = (ArchiveFile) it.next();
- if (target.equals(source)) {
- return true;
- }
- }
- return false;
- }
-
- /**
- * Get the classpath entries for a JAXRS Library
- *
- * @param lib
- * @return IClasspathEntry[]
- */
- @SuppressWarnings("unchecked")
- public IClasspathEntry[] getClasspathEntries(JAXRSLibrary lib) {
- // TODO: cache to optimize. probably belongs inside JAXRSLibrary model.
- ArrayList<IClasspathEntry> res = new ArrayList<IClasspathEntry>(lib
- .getArchiveFiles().size());
- for (Iterator it = lib.getArchiveFiles().iterator(); it.hasNext();) {
- ArchiveFile jar = (ArchiveFile) it.next();
- if (jar != null && jar.exists()) {
- IClasspathEntry entry = getClasspathEntry(jar);
- if (entry != null)
- res.add(entry);
- }
- }
- IClasspathEntry[] entries = res
- .toArray(new IClasspathEntry[res.size()]);
- return entries;
- }
-
- /**
- * Create IClasspathEntry for ArchiveFile
- *
- * @param jar
- * @return IClasspathEntry
- */
- public IClasspathEntry getClasspathEntry(ArchiveFile jar) {
- IClasspathEntry entry = null;
- if (jar != null && jar.exists()) {
- entry = JavaCore.newLibraryEntry(new Path(jar
- .getResolvedSourceLocation()), null, null);// , nu,
- // sourceAttachRoot,
- // accessRules,
- // extraAttributes,
- // false/*not
- // exported*/);
- }
- return entry;
- }
-
- /**
- * Binds JAXRS Libraries to classpath containers when the library changes.
- *
- * This method will deal with library/cp container renames by removing the
- * old classpath container and then adding.
- *
- * @param oldId
- * @param newId
- * @param monitor
- * @throws JavaModelException
- */
- public static void rebindClasspathContainerEntries(String oldId,
- String newId, IProgressMonitor monitor) throws JavaModelException {
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- IJavaProject[] projects = JavaCore.create(root).getJavaProjects();
- IPath containerPath = new Path(
- JAXRSLibraryConfigurationHelper.JAXRS_LIBRARY_CP_CONTAINER_ID)
- .append(newId);
- IPath oldContainerPath = new Path(
- JAXRSLibraryConfigurationHelper.JAXRS_LIBRARY_CP_CONTAINER_ID)
- .append(oldId);
-
- JAXRSLibrary lib = JAXRSLibraryRegistryUtil.getInstance()
- .getJAXRSLibraryRegistry().getJAXRSLibraryByID(newId);
- List<IJavaProject> affectedProjects = new ArrayList<IJavaProject>();
- boolean removeAndAddBecauseOfRename = (!oldId.equals(newId));
- // find all projects using the old container name...
- for (int i = 0; i < projects.length; i++) {
- IJavaProject project = projects[i];
- IClasspathEntry[] entries = project.getRawClasspath();
- for (int k = 0; k < entries.length; k++) {
- IClasspathEntry curr = entries[k];
- if (curr.getEntryKind() == IClasspathEntry.CPE_CONTAINER) {
- if (oldContainerPath.equals(curr.getPath())) {
- affectedProjects.add(project);
- break;
- }
- }
- }
- }
-
- if (!affectedProjects.isEmpty()) {
- IJavaProject[] affected = affectedProjects
- .toArray(new IJavaProject[affectedProjects.size()]);
- IClasspathContainer[] containers = new IClasspathContainer[affected.length];
- removeAndAddBecauseOfRename = (!oldId.equals(newId));
- if (removeAndAddBecauseOfRename) {// not very pretty... remove and
- // add new container
- IClasspathEntry newEntry = JavaCore
- .newContainerEntry(containerPath);
- for (int i = 0; i < affected.length; i++) {
- IJavaProject project = affected[i];
- IClasspathEntry[] entries = project.getRawClasspath();
- List<IClasspathEntry> keptEntries = new ArrayList<IClasspathEntry>();
- // keep all entries except the old one
- for (int k = 0; k < entries.length; k++) {
- IClasspathEntry curr = entries[k];
- if (curr.getEntryKind() == IClasspathEntry.CPE_CONTAINER) {
- if (!oldContainerPath.equals(curr.getPath()))
- keptEntries.add(curr);
- } else {
- keptEntries.add(curr);
- }
- }
- // add new container entry
- keptEntries.add(newEntry);
- setRawClasspath(project, keptEntries, monitor);
- }
-
- } else {// rebind
-
- JAXRSLibraryClasspathContainer container = new JAXRSLibraryClasspathContainer(
- lib);
- containers[0] = container;
-
- JavaCore.setClasspathContainer(containerPath, affected,
- containers, monitor);
- }
- } else {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
-
- /**
- * Sets the raw classpath on a project and logs an error if it when a
- * JavaModelException occurs
- *
- * @param project
- * @param cpEntries
- * @param monitor
- */
- public static void setRawClasspath(IJavaProject project,
- List<IClasspathEntry> cpEntries, IProgressMonitor monitor) {
- IClasspathEntry[] entries = cpEntries.toArray(new IClasspathEntry[0]);
- try {
- project.setRawClasspath(entries, monitor);
- } catch (JavaModelException e) {
- JAXRSCorePlugin.log(e, "Unable to set classpath for: "
- + project.getProject().getName());
- }
- }
-
- /**
- * Return the URI for the specified JAXRS Library Registry
- *
- * @param registryVersion
- * @return URI
- * @throws MalformedURLException
- */
- public static URI getRegistryURI(String registryVersion)
- throws MalformedURLException {
- URL jaxrsLibRegURL = new URL(Platform.getInstanceLocation().getURL(),
- registryVersion);
- return URI.createURI(jaxrsLibRegURL.toString());
- }
-
- /**
- * Loads the JAXRSLibraryRegistry EMF object from plugin-specfic workspace
- * settings location.
- */
- private void loadJAXRSLibraryRegistry() {
- try {
-
- EPackage.Registry.INSTANCE.put(JAXRS_LIBRARY_REGISTRY_NSURI,
- JAXRSLibraryRegistryPackageImpl.init());
- URI jaxrsLibRegURI = getRegistryURI(".metadata/.plugins/org.eclipse.jst.ws.jaxrs.core/JAXRSLibraryRegistry.xml");
-
- JAXRSLibraryRegistryResourceFactoryImpl resourceFactory = new JAXRSLibraryRegistryResourceFactoryImpl();
- JAXRSLibraryRegistryResource = (JAXRSLibraryRegistryResourceImpl) resourceFactory
- .createResource(jaxrsLibRegURI);
- try {
- Map<String, Boolean> options = new HashMap<String, Boolean>();
- // disable notifications during load to avoid changing stored
- // default implementation
- options.put(XMLResource.OPTION_DISABLE_NOTIFY, Boolean.TRUE);
- JAXRSLibraryRegistryResource.load(options);
- JAXRSLibraryRegistry = (JAXRSLibraryRegistry) JAXRSLibraryRegistryResource
- .getContents().get(0);
-
- loadJAXRSLibraryExtensions();
-
- } catch (IOException ioe) {
- // Create a new Registry instance
- JAXRSLibraryRegistry = JAXRSLibraryRegistryFactory.eINSTANCE
- .createJAXRSLibraryRegistry();
- JAXRSLibraryRegistryResource = (JAXRSLibraryRegistryResourceImpl) resourceFactory
- .createResource(jaxrsLibRegURI);
- JAXRSLibraryRegistryResource.getContents().add(
- JAXRSLibraryRegistry);
- loadJAXRSLibraryExtensions();
- saveJAXRSLibraryRegistry();
- }
- // add adapter to maintain default implementation
- if (JAXRSLibraryRegistry != null) {
- // check that a default impl is set. if not pick first one if
- // available.
- JAXRSLibrary defLib = JAXRSLibraryRegistry
- .getDefaultImplementation();
- if (defLib == null
- && JAXRSLibraryRegistry.getImplJAXRSLibraries().size() > 0) {
- JAXRSLibraryRegistry
- .setDefaultImplementation((JAXRSLibrary) JAXRSLibraryRegistry
- .getImplJAXRSLibraries().get(0));
- saveJAXRSLibraryRegistry();
- }
- JAXRSLibraryRegistry.eAdapters().add(
- MaintainDefaultImplementationAdapter.getInstance());
-
- }
- } catch (MalformedURLException mue) {
- JAXRSCorePlugin.log(IStatus.ERROR,
- Messages.JAXRSLibraryRegistry_ErrorCreatingURL, mue);
- }
- }
-
- // /////////////////////////////// Load and Save JAXRS Library Registry
- // ////////////////////////////////////////////////
-
- /**
- * Creates library registry items from extension points.
- */
- private void loadJAXRSLibraryExtensions() {
- try {
- IExtensionPoint point = Platform.getExtensionRegistry()
- .getExtensionPoint(JAXRSCorePlugin.PLUGIN_ID, LIB_EXT_PT);
- IExtension[] extensions = point.getExtensions();
- for (int i = 0; i < extensions.length; i++) {
- IExtension ext = extensions[i];
- for (int j = 0; j < ext.getConfigurationElements().length; j++) {
- PluginProvidedJAXRSLibraryCreationHelper2 newLibCreator = new PluginProvidedJAXRSLibraryCreationHelper2(
- ext.getConfigurationElements()[j]);
- JAXRSLibrary newLib = newLibCreator.create();
-
- if (newLib != null)
- JAXRSLibraryRegistry.addJAXRSLibrary(newLib);
- }
- }
- } catch (InvalidRegistryObjectException e) {
- JAXRSCorePlugin.log(IStatus.ERROR,
- Messages.JAXRSLibraryRegistry_ErrorLoadingFromExtPt, e);
- }
- }
-
- /**
- * Saves the JAXRSLibraryRegistry EMF object from plugin-specfic workspace
- * settings location. (Called from stop(BundleContext).)
- *
- * @return true if save is successful
- */
- public boolean saveJAXRSLibraryRegistry() {
- boolean saved = false;
- if (JAXRSLibraryRegistryResource != null) {
- try {
- JAXRSLibraryRegistryResource.save(Collections.EMPTY_MAP);
- saved = true;
- } catch (IOException ioe) {
- JAXRSCorePlugin.log(IStatus.ERROR,
- Messages.JAXRSLibraryRegistry_ErrorSaving, ioe);
- }
- } else {
- JAXRSCorePlugin.log(IStatus.ERROR,
- Messages.JAXRSLibraryRegistry_ErrorSaving);
- }
- return saved;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryproviderconfig/JAXRSLibraryProvider.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryproviderconfig/JAXRSLibraryProvider.java
deleted file mode 100644
index 8d52f02..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryproviderconfig/JAXRSLibraryProvider.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20100413 307552 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS and Java EE 6 setup is incorrect
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryproviderconfig;
-
-
-public interface JAXRSLibraryProvider {
- String getLibraryProviderID();
- void setLibraryProviderID(String value);
- boolean getShowUpdateDDCheckBox();
- void setShowUpdateDDCheckBox(boolean show);
- boolean getUpdateDDCheckBoxSelected();
- void setUpdateDDCheckBoxSelected(boolean show);
- String getServletClassName();
- void setServletClassName(String sevletClassName);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryproviderconfig/JAXRSLibraryProviderCreationHelper.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryproviderconfig/JAXRSLibraryProviderCreationHelper.java
deleted file mode 100644
index 25bb146..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryproviderconfig/JAXRSLibraryProviderCreationHelper.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20100413 307552 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS and Java EE 6 setup is incorrect
- * 20100420 309846 ericdp@ca.ibm.com - Eric D. Peters, Remove dead code related to e.p. pluginProvidedJaxrsLibraries
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryproviderconfig;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jst.ws.jaxrs.core.internal.JAXRSCorePlugin;
-import org.eclipse.jst.ws.jaxrs.core.internal.Messages;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Helper class used to create JAXRS Library Providers from the
- * <code>org.eclipse.jst.ws.jaxrs.core.jaxrsLibraryProvider</code>
- * extension-point.
- *
- */
-
-public final class JAXRSLibraryProviderCreationHelper {
- private JAXRSLibraryProviderImpl newLibraryProvider;
- private IConfigurationElement config_element;
- /**
- * Key of the 'libraryProviderID' attribute of the extension point.
- */
- public final static String LibraryProviderID = "libraryProviderID"; //$NON-NLS-1$
-
-
- /**
- * Key of the 'showUpdateDD' attribute of the extension point.
- */
- public final static String ShowUpdateDD = "showUpdateDD"; //$NON-NLS-1$
- /**
- * Key of the 'updateDDSelected' attribute of the extension point.
- */
- public final static String UpdateDDSelected = "updateDDSelected"; //$NON-NLS-1$
- /**
- * Key of the 'isSelected' attribute of the extension point.
- */
- public final static String SevletClassName = "sevletClassName"; //$NON-NLS-1$
-
- /**
- * Creates an instance with the specified IConfigurationElement instance.
- *
- * @param JAXRSLibraryProvider
- * IConfigurationElement instance
- */
- public JAXRSLibraryProviderCreationHelper(
- IConfigurationElement JAXRSLibraryProvider) {
- this.config_element = JAXRSLibraryProvider;
- }
-
-
- /**
- * Creates a new LibraryProvider from the <code>org.eclipse.jst.ws.jaxrs.core.jaxrsLibraryProvider</code>
- * extension-point.
- *
- * @return JAXRSLibraryProvider instance.
- */
- public JAXRSLibraryProvider create() {
- try {
- newLibraryProvider = new JAXRSLibraryProviderImpl();
- newLibraryProvider.setLibraryProviderID(config_element.getAttribute(LibraryProviderID));
- newLibraryProvider.setServletClassName(config_element.getAttribute(SevletClassName));
- newLibraryProvider.setShowUpdateDDCheckBox(Boolean.parseBoolean(config_element
- .getAttribute(ShowUpdateDD)));
- newLibraryProvider.setUpdateDDCheckBoxSelected(Boolean.parseBoolean(config_element
- .getAttribute(UpdateDDSelected)));
- return newLibraryProvider;
- } catch (Exception e) {
- JAXRSCorePlugin
- .log(
- e,
- NLS
- .bind(
- Messages.JAXRSLibraryProviderCreationHelper_ErrorCreating,
- newLibraryProvider.getLibraryProviderID()));
- }
- return null;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryproviderconfig/JAXRSLibraryProviderImpl.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryproviderconfig/JAXRSLibraryProviderImpl.java
deleted file mode 100644
index 86ef07b..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryproviderconfig/JAXRSLibraryProviderImpl.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20100413 307552 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS and Java EE 6 setup is incorrect
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryproviderconfig;
-
-
-public class JAXRSLibraryProviderImpl implements JAXRSLibraryProvider {
- boolean showUpdateDD = false;
- boolean updateDDSelected = false;
- String libraryProviderID;
- String servletClassName;
- public JAXRSLibraryProviderImpl() {
- }
- public String getLibraryProviderID() {
- return libraryProviderID;
- }
-
- public void setLibraryProviderID(String id) {
- this.libraryProviderID = id;
-
- }
- public boolean getShowUpdateDDCheckBox() {
- return showUpdateDD;
- }
- public void setShowUpdateDDCheckBox(boolean show) {
- this.showUpdateDD = show;
- }
- public boolean getUpdateDDCheckBoxSelected() {
- return this.updateDDSelected;
- }
- public void setUpdateDDCheckBoxSelected(boolean selected) {
- this.updateDDSelected = selected;
- }
- public String getServletClassName() {
- return this.servletClassName;
- }
- public void setServletClassName(String name) {
- this.servletClassName = name;
-
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryproviderconfig/JAXRSLibraryProviderUtil.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryproviderconfig/JAXRSLibraryProviderUtil.java
deleted file mode 100644
index f2b5c2d..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryproviderconfig/JAXRSLibraryProviderUtil.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20100413 307552 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS and Java EE 6 setup is incorrect
- * 20100618 307059 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS properties page- fields empty or incorrect
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryproviderconfig;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.InvalidRegistryObjectException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.ws.jaxrs.core.internal.JAXRSCorePlugin;
-import org.eclipse.jst.ws.jaxrs.core.internal.Messages;
-import org.eclipse.jst.ws.jaxrs.core.internal.project.facet.IJAXRSFacetInstallDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * A singleton maintains lists of Library Providers
- *
- */
-public class JAXRSLibraryProviderUtil {
- private static JAXRSLibraryProviderUtil instance = null;
-
- private static List<JAXRSLibraryProvider> libraryProviders = new Vector<JAXRSLibraryProvider>();
-
- private static final String JAXRS_LIBRARY_PROVIDER_EXT_PT = "jaxrsLibraryProvider";
-
-
- /**
- * Private constructor
- */
- private JAXRSLibraryProviderUtil() {
- // nothing to do
- }
-
- public static boolean isUpdateDDCheckBoxSelectedByDefault(String libraryID) {
- if (libraryID == null)
- return false;
-
- JAXRSLibraryProviderUtil.getInstance();
- java.util.List<JAXRSLibraryProvider> libraryProviders = getLibraryProviders();
-
- Iterator<JAXRSLibraryProvider> libraryProvidersIterator = libraryProviders
- .iterator();
- while (libraryProvidersIterator.hasNext()) {
- JAXRSLibraryProvider thisLibraryProvider = libraryProvidersIterator
- .next();
- if (libraryID.equals(thisLibraryProvider.getLibraryProviderID())) {
- return thisLibraryProvider.getUpdateDDCheckBoxSelected();
- }
-
- }
-
- return false;
- }
-
- public static boolean isUpdateDDCheckBoxSupportAvailable(String libraryID) {
- if (libraryID == null || libraryID.length() == 0)
- return false;
-
- JAXRSLibraryProviderUtil.getInstance();
- java.util.List<JAXRSLibraryProvider> libraryProviders = getLibraryProviders();
-
- Iterator<JAXRSLibraryProvider> libraryProvidersIterator = libraryProviders
- .iterator();
- while (libraryProvidersIterator.hasNext()) {
- JAXRSLibraryProvider thisLibraryProvider = libraryProvidersIterator
- .next();
- if (libraryID.equals(thisLibraryProvider.getLibraryProviderID())) {
- if (thisLibraryProvider.getShowUpdateDDCheckBox()) {
- return true;
- }
- }
-
- }
-
- return false;
- }
- public static boolean servletClassNameHasLibraryProvider(String servletClassName) {
- if (servletClassName == null)
- return false;
-
- JAXRSLibraryProviderUtil.getInstance();
- java.util.List<JAXRSLibraryProvider> libraryProviders = getLibraryProviders();
-
- Iterator<JAXRSLibraryProvider> libraryProvidersIterator = libraryProviders
- .iterator();
- while (libraryProvidersIterator.hasNext()) {
- JAXRSLibraryProvider thisLibraryProvider = libraryProvidersIterator
- .next();
- if (servletClassName.equals(thisLibraryProvider.getServletClassName())) {
- return true;
- }
-
- }
-
- return false;
- }
- public static String getServletClassName(String libraryID) {
- String toReturn = "";
- if (libraryID == null || libraryID.length() == 0)
- return toReturn;
-
- JAXRSLibraryProviderUtil.getInstance();
- java.util.List<JAXRSLibraryProvider> libraryProviders = getLibraryProviders();
-
- Iterator<JAXRSLibraryProvider> libraryProvidersIterator = libraryProviders
- .iterator();
- while (libraryProvidersIterator.hasNext()) {
- JAXRSLibraryProvider thisLibraryProvider = libraryProvidersIterator
- .next();
- if (libraryID.equals(thisLibraryProvider.getLibraryProviderID())) {
- return thisLibraryProvider.getServletClassName() != null ? thisLibraryProvider.getServletClassName() : toReturn;
- }
-
- }
-
- return toReturn;
- }
-
- /**
- * Return the singleton instance of JAXRSLibraryProviderUtil.
- *
- * @return JAXRSLibraryProviderUtil
- */
- public synchronized static JAXRSLibraryProviderUtil getInstance() {
- if (instance == null) {
- instance = new JAXRSLibraryProviderUtil();
- instance.loadLibraryProvidersExtensions();
- }
- return instance;
- }
-
- /**
- * Creates jax-rs library provider items from extension points.
- */
- private void loadLibraryProvidersExtensions() {
- try {
- IExtensionPoint point = Platform.getExtensionRegistry()
- .getExtensionPoint(JAXRSCorePlugin.PLUGIN_ID, JAXRS_LIBRARY_PROVIDER_EXT_PT);
- IExtension[] extensions = point.getExtensions();
- for (int i = 0; i < extensions.length; i++) {
- IExtension ext = extensions[i];
- for (int j = 0; j < ext.getConfigurationElements().length; j++) {
- JAXRSLibraryProviderCreationHelper newLibCreator = new JAXRSLibraryProviderCreationHelper(
- ext.getConfigurationElements()[j]);
- JAXRSLibraryProvider newLibraryProvider = newLibCreator.create();
-
- if (newLibraryProvider != null)
- libraryProviders.add(newLibraryProvider);
- }
- }
- } catch (InvalidRegistryObjectException e) {
- JAXRSCorePlugin.log(IStatus.ERROR,
- Messages.JAXRSLibraryProvider_ErrorLoadingFromExtPt, e);
- }
- }
-
- public static List<JAXRSLibraryProvider> getLibraryProviders() {
- return libraryProviders;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryregistry/adapter/MaintainDefaultImplementationAdapter.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryregistry/adapter/MaintainDefaultImplementationAdapter.java
deleted file mode 100644
index 77b57df..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryregistry/adapter/MaintainDefaultImplementationAdapter.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100420 309846 ericdp@ca.ibm.com - Eric D. Peters, Remove dead code related to e.p. pluginProvidedJaxrsLibraries
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.adapter;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibrary;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistry;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryconfig.JAXRSLibraryRegistryUtil;
-
-/**
- * EMF adapter that attempts to always maintain a default implementation
- * JAXRSLibrary upon addition and removal of JAXRSLibrary instances *
- *
- * @deprecated
- *
- * <p>
- * <b>Provisional API - subject to change - do not use</b>
- * </p>
- */
-public class MaintainDefaultImplementationAdapter extends AdapterImpl {
-
- private static MaintainDefaultImplementationAdapter INSTANCE = new MaintainDefaultImplementationAdapter();
-
- /**
- * Gets the single instance of this adapter.
- *
- * @return The single instance of this adapter.
- */
- public static MaintainDefaultImplementationAdapter getInstance() {
- return INSTANCE;
- }
-
- /**
- * Called to notify this adapter that a change has occured.
- *
- * @param notification
- * EMF Notification instance
- */
- public void notifyChanged(Notification notification) {
- Object objNotifier = notification.getNotifier();
- if (objNotifier instanceof JAXRSLibraryRegistry) {
- int eventType = notification.getEventType();
- switch (eventType) {
- case Notification.ADD:
- Object objNewValue = notification.getNewValue();
- if (objNewValue instanceof JAXRSLibrary) {
- libraryAdded((JAXRSLibrary) objNewValue);
- }
- break;
- case Notification.REMOVE:
- Object objOldValue = notification.getOldValue();
- if (objOldValue instanceof JAXRSLibrary) {
- libraryRemoved((JAXRSLibrary) objOldValue);
- }
- break;
- }
- } else if (objNotifier instanceof JAXRSLibrary) {
-
- }
- }
-
- /**
- * Checks if the library added is an implementation and, if so, makes it the
- * default implementation if it is the only implementation.
- *
- * @param library
- * JAXRSLibrary instance
- */
- @SuppressWarnings("unchecked")
- protected void libraryAdded(JAXRSLibrary library) {
- if (library != null) {
- JAXRSLibraryRegistry jaxrsLibReg = JAXRSLibraryRegistryUtil
- .getInstance().getJAXRSLibraryRegistry();
- EList impls = jaxrsLibReg.getImplJAXRSLibraries();
- if (impls.size() == 1) {
- jaxrsLibReg.setDefaultImplementation(library);
- }
- }
- }
-
- /**
- * Checks if the library removed is the default implementation and, if so,
- * makes the first remaining implementation the new default or nulls out the
- * default implementation if no other implementation remains.
- *
- * @param library
- * JAXRSLibrary instance
- */
- protected void libraryRemoved(JAXRSLibrary library) {
- if (library != null) {
- JAXRSLibraryRegistry jaxrsLibReg = JAXRSLibraryRegistryUtil
- .getInstance().getJAXRSLibraryRegistry();
- JAXRSLibrary defaultImpl = jaxrsLibReg.getDefaultImplementation();
- if (defaultImpl == null
- || library.getID().equals(defaultImpl.getID())) {
- setNewDefaultImplementation();
- }
- }
- }
-
- /**
- * Sets the first available JAXRSLibrary marked as an implementation as the
- * default implementation or sets the default implementation to null if no
- * JAXRSLibrary is marked as an implementation.
- */
- @SuppressWarnings("unchecked")
- protected void setNewDefaultImplementation() {
- JAXRSLibraryRegistry jaxrsLibReg = JAXRSLibraryRegistryUtil
- .getInstance().getJAXRSLibraryRegistry();
- EList impls = jaxrsLibReg.getImplJAXRSLibraries();
- if (impls.size() > 0) {
- jaxrsLibReg.setDefaultImplementation((JAXRSLibrary) impls.get(0));
- } else {
- jaxrsLibReg.setDefaultImplementation(null);
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryregistry/impl/ArchiveFileImpl.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryregistry/impl/ArchiveFileImpl.java
deleted file mode 100644
index 74baf48..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryregistry/impl/ArchiveFileImpl.java
+++ /dev/null
@@ -1,785 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100420 309846 ericdp@ca.ibm.com - Eric D. Peters, Remove dead code related to e.p. pluginProvidedJaxrsLibraries
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.ws.jaxrs.core.internal.JAXRSCorePlugin;
-import org.eclipse.jst.ws.jaxrs.core.internal.Messages;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.ArchiveFile;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistryPackage;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibrary;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.PluginProvidedJAXRSLibrary;
-import org.eclipse.osgi.util.NLS;
-import org.osgi.framework.Bundle;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Archive File</b></em>'. <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.ArchiveFileImpl#isRelativeToWorkspace
- * <em>Relative To Workspace</em>}</li>
- * <li>
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.ArchiveFileImpl#getSourceLocation
- * <em>Source Location</em>}</li>
- * <li>
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.ArchiveFileImpl#getRelativeDestLocation
- * <em>Relative Dest Location</em>}</li>
- * <li>
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.ArchiveFileImpl#getJAXRSLibrary
- * <em>JAXRS Library</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- *
- * @deprecated
- *
- * <p>
- * <b>Provisional API - subject to change - do not use</b>
- * </p>
- */
-public class ArchiveFileImpl extends EObjectImpl implements ArchiveFile {
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-
- /**
- * The default value of the '{@link #isRelativeToWorkspace()
- * <em>Relative To Workspace</em>}' attribute. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @see #isRelativeToWorkspace()
- * @generated
- * @ordered
- */
- protected static final boolean RELATIVE_TO_WORKSPACE_EDEFAULT = true;
-
- /**
- * The cached value of the '{@link #isRelativeToWorkspace()
- * <em>Relative To Workspace</em>}' attribute. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @see #isRelativeToWorkspace()
- * @generated
- * @ordered
- */
- protected boolean relativeToWorkspace = RELATIVE_TO_WORKSPACE_EDEFAULT;
-
- /**
- * The default value of the '{@link #getSourceLocation()
- * <em>Source Location</em>}' attribute. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @see #getSourceLocation()
- * @generated
- * @ordered
- */
- protected static final String SOURCE_LOCATION_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getSourceLocation()
- * <em>Source Location</em>}' attribute. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @see #getSourceLocation()
- * @generated
- * @ordered
- */
- protected String sourceLocation = SOURCE_LOCATION_EDEFAULT;
-
- /**
- * The default value of the '{@link #getRelativeDestLocation()
- * <em>Relative Dest Location</em>}' attribute. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @see #getRelativeDestLocation()
- * @generated
- * @ordered
- */
- protected static final String RELATIVE_DEST_LOCATION_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getRelativeDestLocation()
- * <em>Relative Dest Location</em>}' attribute. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @see #getRelativeDestLocation()
- * @generated
- * @ordered
- */
- protected String relativeDestLocation = RELATIVE_DEST_LOCATION_EDEFAULT;
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected ArchiveFileImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the static eClass <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return JAXRSLibraryRegistryPackage.Literals.ARCHIVE_FILE;
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the source location <!-- end-user-doc -->
- * @generated
- */
- public String getSourceLocation() {
- return sourceLocation;
- }
-
- /**
- * <!-- begin-user-doc --> Enhanced to not only set the location but also to
- * attempt to determine if the location passed is relative to the current
- * workspace. If so, only the relative location is stored. If not, the full
- * location as passed is stored and the relativeToWorkspace property is set
- * to false. To override this behaviour and set the absolute location as
- * passed regardless, call setRelativeToWorkspace(false) BEFORE calling this
- * method.
- *
- * @param newSourceLocation
- *
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public void setSourceLocation(String newSourceLocation) {
- String oldSourceLocation = sourceLocation;
- if (relativeToWorkspace) {
- IWorkspaceRoot workspaceRoot = getWorkspaceRoot();
- if (workspaceRoot != null) {
- IPath wsRootPath = workspaceRoot.getLocation();
- IPath srcPath = new Path(newSourceLocation);
- if (workspaceRoot.findMember(srcPath) != null) {
- sourceLocation = newSourceLocation;
- } else if (wsRootPath.isPrefixOf(srcPath)) {
- int segmentsMatched = wsRootPath
- .matchingFirstSegments(srcPath);
- srcPath = srcPath.removeFirstSegments(segmentsMatched)
- .setDevice(null);
- sourceLocation = srcPath.toOSString();
- } else {
- sourceLocation = newSourceLocation;
- relativeToWorkspace = false;
- }
- }
- } else {
- sourceLocation = newSourceLocation;
- }
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- JAXRSLibraryRegistryPackage.ARCHIVE_FILE__SOURCE_LOCATION,
- oldSourceLocation, sourceLocation));
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return true if file is relative to workspace <!-- end-user-doc -->
- * @generated
- */
- public boolean isRelativeToWorkspace() {
- return relativeToWorkspace;
- }
-
- /**
- * <!-- begin-user-doc --> To override workspace-relative recognition
- * behaviour, be sure to call this method with a false value BEFORE calling
- * setLocation(String).
- *
- * @param newRelativeToWorkspace
- * <!-- end-user-doc -->
- * @generated
- */
- public void setRelativeToWorkspace(boolean newRelativeToWorkspace) {
- boolean oldRelativeToWorkspace = relativeToWorkspace;
- relativeToWorkspace = newRelativeToWorkspace;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(
- this,
- Notification.SET,
- JAXRSLibraryRegistryPackage.ARCHIVE_FILE__RELATIVE_TO_WORKSPACE,
- oldRelativeToWorkspace, relativeToWorkspace));
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the relative destination location <!-- end-user-doc -->
- * @generated
- */
- public String getRelativeDestLocation() {
- return relativeDestLocation;
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @param newRelativeDestLocation
- * <!-- end-user-doc -->
- * @generated
- */
- public void setRelativeDestLocation(String newRelativeDestLocation) {
- String oldRelativeDestLocation = relativeDestLocation;
- relativeDestLocation = newRelativeDestLocation;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(
- this,
- Notification.SET,
- JAXRSLibraryRegistryPackage.ARCHIVE_FILE__RELATIVE_DEST_LOCATION,
- oldRelativeDestLocation, relativeDestLocation));
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the JAXRS Library instance <!-- end-user-doc -->
- * @generated
- */
- public JAXRSLibrary getJAXRSLibrary() {
- if (eContainerFeatureID != JAXRSLibraryRegistryPackage.ARCHIVE_FILE__JAXRS_LIBRARY)
- return null;
- return (JAXRSLibrary) eContainer();
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @param newJAXRSLibrary
- * @param msgs
- * @return NotificationChain <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetJAXRSLibrary(JAXRSLibrary newJAXRSLibrary,
- NotificationChain msgs) {
- msgs = eBasicSetContainer((InternalEObject) newJAXRSLibrary,
- JAXRSLibraryRegistryPackage.ARCHIVE_FILE__JAXRS_LIBRARY, msgs);
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @param newJAXRSLibrary
- * <!-- end-user-doc -->
- * @generated
- */
- public void setJAXRSLibrary(JAXRSLibrary newJAXRSLibrary) {
- if (newJAXRSLibrary != eInternalContainer()
- || (eContainerFeatureID != JAXRSLibraryRegistryPackage.ARCHIVE_FILE__JAXRS_LIBRARY && newJAXRSLibrary != null)) {
- if (EcoreUtil.isAncestor(this, newJAXRSLibrary))
- throw new IllegalArgumentException(
- "Recursive containment not allowed for " + toString());
- NotificationChain msgs = null;
- if (eInternalContainer() != null)
- msgs = eBasicRemoveFromContainer(msgs);
- if (newJAXRSLibrary != null)
- msgs = ((InternalEObject) newJAXRSLibrary)
- .eInverseAdd(
- this,
- JAXRSLibraryRegistryPackage.JAXRS_LIBRARY__ARCHIVE_FILES,
- JAXRSLibrary.class, msgs);
- msgs = basicSetJAXRSLibrary(newJAXRSLibrary, msgs);
- if (msgs != null)
- msgs.dispatch();
- } else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- JAXRSLibraryRegistryPackage.ARCHIVE_FILE__JAXRS_LIBRARY,
- newJAXRSLibrary, newJAXRSLibrary));
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the path <!-- end-user-doc -->
- * @generated NOT
- */
- public String getPath() {
- String path = null;
- String resolvedSourceLocation = getResolvedSourceLocation();
- if (resolvedSourceLocation != null) {
- int iPos = resolvedSourceLocation.lastIndexOf('/');
- if (iPos < 0) {
- iPos = resolvedSourceLocation.lastIndexOf('\\');
- }
- if (iPos < 1) {
- path = ""; //$NON-NLS-1$
- } else {
- path = resolvedSourceLocation.substring(0, iPos);
- }
- }
- return path;
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the name <!-- end-user-doc -->
- * @generated NOT
- */
- public String getName() {
- String name = null;
- String resolvedSourceLocation = getResolvedSourceLocation();
- if (resolvedSourceLocation != null) {
- int iPos = resolvedSourceLocation.lastIndexOf('/');
- if (iPos < 0) {
- iPos = resolvedSourceLocation.lastIndexOf('\\');
- }
- if (iPos < 0 || iPos == resolvedSourceLocation.length() - 1) {
- name = resolvedSourceLocation;
- } else {
- name = resolvedSourceLocation.substring(iPos + 1);
- }
- }
- return name;
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return true if the archive file exists in the bundle <!-- end-user-doc
- * -->
- * @generated NOT
- */
- public boolean exists() {
- boolean exists = false;
- if (getJAXRSLibrary() instanceof PluginProvidedJAXRSLibrary && isRelativeToWorkspace()) {
- Bundle bundle = getBundle();
- if (bundle != null) {
- exists = bundle.getEntry(sourceLocation) != null;
- }
- } else {
- String resolvedSourceLocation = getResolvedSourceLocation();
- if (resolvedSourceLocation != null) {
- exists = new File(resolvedSourceLocation).exists();
- }
- }
- return exists;
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @param object
- * @return true if equal <!-- end-user-doc -->
- * @generated NOT
- */
- public boolean equals(Object object) {
- boolean equal = false;
- if (object instanceof ArchiveFile) {
- String resolvedSourceLocation = getResolvedSourceLocation();
- String objResolvedSourceLocation = ((ArchiveFile) object)
- .getResolvedSourceLocation();
- if (resolvedSourceLocation == null
- && objResolvedSourceLocation == null) {
- equal = true;
- } else if (resolvedSourceLocation != null) {
- equal = resolvedSourceLocation
- .equals(objResolvedSourceLocation);
- }
- }
- return equal;
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return a the resolved source location hash or 0 if it is null <!--
- * end-user-doc -->
- * @generated NOT
- */
- public int hashCode() {
- return getResolvedSourceLocation() != null ? getResolvedSourceLocation()
- .hashCode()
- : 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @param baseDestLocation
- * @return true if the copy is successful <!-- end-user-doc -->
- * @generated NOT
- */
- public boolean copyTo(String baseDestLocation) {
- boolean copied = false;
- InputStream in = null;
- OutputStream out = null;
- IPath outPath = new Path(baseDestLocation);
- if (relativeDestLocation != null) {
- outPath = outPath.append(relativeDestLocation);
- }
- outPath = outPath.append(getName());
- try {
- if (!outPath.toFile().exists()) {
- out = new FileOutputStream(outPath.toOSString());
- } else {
- return copied;
- }
- if (getJAXRSLibrary() instanceof PluginProvidedJAXRSLibrary) {
- Bundle bundle = getBundle();
- URL inURL = bundle.getEntry(sourceLocation);
- if (inURL != null) {
- in = inURL.openStream();
- } else {
- JAXRSCorePlugin
- .log(
- IStatus.ERROR,
- NLS
- .bind(
- Messages.ArchiveFileImpl_CannotLocatePluginRelativeFile,
- sourceLocation));
- return copied;
- }
- } else {
- in = new FileInputStream(getResolvedSourceLocation());
- }
- byte[] buf = new byte[1024];
- int len = 0;
- while ((len = in.read(buf)) > 0) {
- out.write(buf, 0, len);
- }
- copied = true;
- } catch (FileNotFoundException fnfe) {
- JAXRSCorePlugin.log(IStatus.ERROR,
- Messages.ArchiveFileImpl_CannotCopyFile, fnfe);
- } catch (IOException ioe) {
- JAXRSCorePlugin.log(IStatus.ERROR,
- Messages.ArchiveFileImpl_CannotCopyFile, ioe);
- } finally {
- try {
- if (in != null) {
- in.close();
- }
- if (out != null) {
- out.close();
- }
- } catch (IOException ioe) {
- JAXRSCorePlugin.log(IStatus.WARNING,
- Messages.ArchiveFileImpl_CannotCloseFile, ioe);
- }
- }
- return copied;
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the resolved source location <!-- end-user-doc -->
- * @generated NOT
- */
- public String getResolvedSourceLocation() {
- String resolvedSourceLocation = null;
- /**
- * The implementation to support PluginProvidedJAXRSLibrary assume the
- * following. 1. Plugin provided JAXRS Library needs to be distributed
- * as an expanded folder. 2. JARs for plugin provided JAXRS Library need
- * to reside inside the folder mentioned in item 1 above. 3. Each JAR
- * needs to specify a relative path for the folder mentioned in item 1
- * above.
- *
- * Fix for bug 144954.
- */
- if (getJAXRSLibrary() instanceof PluginProvidedJAXRSLibrary) {
- PluginProvidedJAXRSLibrary library = (PluginProvidedJAXRSLibrary) getJAXRSLibrary();
- Bundle bundle = getBundle();
- if (bundle != null && isRelativeToWorkspace()) {
- // resolvedSourceLocation = appendSeparator(bundleLocation) +
- // sourceLocation;
- try {
- Path srcPath = new Path(sourceLocation);
- URL fileURL = FileLocator.find(bundle, srcPath, null);
- if (fileURL != null) {
- URL url = FileLocator.resolve(fileURL);
- resolvedSourceLocation = url.getPath();
- } else
- resolvedSourceLocation = sourceLocation;
- } catch (IOException e) {
- resolvedSourceLocation = sourceLocation;
- }
- } else {
- resolvedSourceLocation = sourceLocation;
- }
- } else {
- if (isRelativeToWorkspace()) {
- IWorkspaceRoot workspaceRoot = getWorkspaceRoot();
- if (workspaceRoot != null) {
- String workspaceLocation = workspaceRoot.getLocation()
- .toOSString();
- if (workspaceLocation != null) {
- resolvedSourceLocation = appendSeparator(workspaceLocation)
- + sourceLocation;
- } else {
- resolvedSourceLocation = sourceLocation;
- }
- } else {
- resolvedSourceLocation = sourceLocation;
- }
- } else {
- resolvedSourceLocation = sourceLocation;
- }
- }
- return resolvedSourceLocation;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain eInverseAdd(InternalEObject otherEnd,
- int featureID, NotificationChain msgs) {
- switch (featureID) {
- case JAXRSLibraryRegistryPackage.ARCHIVE_FILE__JAXRS_LIBRARY:
- if (eInternalContainer() != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return basicSetJAXRSLibrary((JAXRSLibrary) otherEnd, msgs);
- }
- return super.eInverseAdd(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd,
- int featureID, NotificationChain msgs) {
- switch (featureID) {
- case JAXRSLibraryRegistryPackage.ARCHIVE_FILE__JAXRS_LIBRARY:
- return basicSetJAXRSLibrary(null, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @param msgs
- * @return NotificationChain <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eBasicRemoveFromContainerFeature(
- NotificationChain msgs) {
- switch (eContainerFeatureID) {
- case JAXRSLibraryRegistryPackage.ARCHIVE_FILE__JAXRS_LIBRARY:
- return eInternalContainer().eInverseRemove(this,
- JAXRSLibraryRegistryPackage.JAXRS_LIBRARY__ARCHIVE_FILES,
- JAXRSLibrary.class, msgs);
- }
- return super.eBasicRemoveFromContainerFeature(msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @param featureID
- * @param resolve
- * @param coreType
- * @return <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case JAXRSLibraryRegistryPackage.ARCHIVE_FILE__RELATIVE_TO_WORKSPACE:
- return isRelativeToWorkspace() ? Boolean.TRUE : Boolean.FALSE;
- case JAXRSLibraryRegistryPackage.ARCHIVE_FILE__SOURCE_LOCATION:
- return getSourceLocation();
- case JAXRSLibraryRegistryPackage.ARCHIVE_FILE__RELATIVE_DEST_LOCATION:
- return getRelativeDestLocation();
- case JAXRSLibraryRegistryPackage.ARCHIVE_FILE__JAXRS_LIBRARY:
- return getJAXRSLibrary();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @param featureID
- * @param newValue
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case JAXRSLibraryRegistryPackage.ARCHIVE_FILE__RELATIVE_TO_WORKSPACE:
- setRelativeToWorkspace(((Boolean) newValue).booleanValue());
- return;
- case JAXRSLibraryRegistryPackage.ARCHIVE_FILE__SOURCE_LOCATION:
- setSourceLocation((String) newValue);
- return;
- case JAXRSLibraryRegistryPackage.ARCHIVE_FILE__RELATIVE_DEST_LOCATION:
- setRelativeDestLocation((String) newValue);
- return;
- case JAXRSLibraryRegistryPackage.ARCHIVE_FILE__JAXRS_LIBRARY:
- setJAXRSLibrary((JAXRSLibrary) newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case JAXRSLibraryRegistryPackage.ARCHIVE_FILE__RELATIVE_TO_WORKSPACE:
- setRelativeToWorkspace(RELATIVE_TO_WORKSPACE_EDEFAULT);
- return;
- case JAXRSLibraryRegistryPackage.ARCHIVE_FILE__SOURCE_LOCATION:
- setSourceLocation(SOURCE_LOCATION_EDEFAULT);
- return;
- case JAXRSLibraryRegistryPackage.ARCHIVE_FILE__RELATIVE_DEST_LOCATION:
- setRelativeDestLocation(RELATIVE_DEST_LOCATION_EDEFAULT);
- return;
- case JAXRSLibraryRegistryPackage.ARCHIVE_FILE__JAXRS_LIBRARY:
- setJAXRSLibrary((JAXRSLibrary) null);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case JAXRSLibraryRegistryPackage.ARCHIVE_FILE__RELATIVE_TO_WORKSPACE:
- return relativeToWorkspace != RELATIVE_TO_WORKSPACE_EDEFAULT;
- case JAXRSLibraryRegistryPackage.ARCHIVE_FILE__SOURCE_LOCATION:
- return SOURCE_LOCATION_EDEFAULT == null ? sourceLocation != null
- : !SOURCE_LOCATION_EDEFAULT.equals(sourceLocation);
- case JAXRSLibraryRegistryPackage.ARCHIVE_FILE__RELATIVE_DEST_LOCATION:
- return RELATIVE_DEST_LOCATION_EDEFAULT == null ? relativeDestLocation != null
- : !RELATIVE_DEST_LOCATION_EDEFAULT
- .equals(relativeDestLocation);
- case JAXRSLibraryRegistryPackage.ARCHIVE_FILE__JAXRS_LIBRARY:
- return getJAXRSLibrary() != null;
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * Gets the Bundle instance by parent PluginProvidedJAXRSLibrary instance's
- * pluginID property, if and only if the parent JAXRSLibrary instance IS a
- * PluginProvidedJAXRSLibrary, else returns null.
- *
- * @return Bundle instance, or null if not located or applicable
- */
- protected Bundle getBundle() {
- Bundle bundle = null;
- if (getJAXRSLibrary() instanceof PluginProvidedJAXRSLibrary) {
- String pluginID = ((PluginProvidedJAXRSLibrary) getJAXRSLibrary())
- .getPluginID();
- if (pluginID != null) {
- bundle = Platform.getBundle(pluginID);
- }
- }
- return bundle;
- }
-
- /**
- * Gets the IWorkspaceRoot instance.
- *
- * @return IWorkspaceRoot instance
- */
- protected IWorkspaceRoot getWorkspaceRoot() {
- IWorkspaceRoot workspaceRoot = null;
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- if (workspace != null) {
- workspaceRoot = workspace.getRoot();
- }
- return workspaceRoot;
- }
-
- /**
- * @param path
- * @return the the path string with invalid path separators correctly fixed
- */
- protected String appendSeparator(String path) {
- String newPath = null;
- if (!path.endsWith("\\") && !path.endsWith("/")) { //$NON-NLS-1$ //$NON-NLS-2$
- newPath = path + System.getProperty("file.separator"); //$NON-NLS-1$
- } else {
- newPath = path;
- }
- return newPath;
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the string representation of this archive file <!-- end-user-doc
- * -->
- * @generated
- */
- public String toString() {
- if (eIsProxy())
- return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (RelativeToWorkspace: ");
- result.append(relativeToWorkspace);
- result.append(", SourceLocation: ");
- result.append(sourceLocation);
- result.append(", RelativeDestLocation: ");
- result.append(relativeDestLocation);
- result.append(')');
- return result.toString();
- }
-
-} // ArchiveFileImpl
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryregistry/impl/JAXRSLibraryImpl.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryregistry/impl/JAXRSLibraryImpl.java
deleted file mode 100644
index c173f40..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryregistry/impl/JAXRSLibraryImpl.java
+++ /dev/null
@@ -1,506 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100420 309846 ericdp@ca.ibm.com - Eric D. Peters, Remove dead code related to e.p. pluginProvidedJaxrsLibraries
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.ArchiveFile;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistryFactory;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistryPackage;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibrary;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.adapter.MaintainDefaultImplementationAdapter;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>JAXRS Library</b></em>'. <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.JAXRSLibraryImpl#getID
- * <em>ID</em>}</li>
- * <li>
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.JAXRSLibraryImpl#getName
- * <em>Name</em>}</li>
- * <li>
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.JAXRSLibraryImpl#getJAXRSVersion
- * <em>JAXRS Version</em>}</li>
- * <li>
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.JAXRSLibraryImpl#isDeployed
- * <em>Deployed</em>}</li>
- * <li>
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.JAXRSLibraryImpl#isImplementation
- * <em>Implementation</em>}</li>
- * <li>
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.JAXRSLibraryImpl#getArchiveFiles
- * <em>Archive Files</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- *
- * @deprecated
- *
- * <p>
- * <b>Provisional API - subject to change - do not use</b>
- * </p>
- */
-public class JAXRSLibraryImpl extends EObjectImpl implements JAXRSLibrary {
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-
- /**
- * The default value of the '{@link #getID() <em>ID</em>}' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getID()
- * @generated
- * @ordered
- */
- protected static final String ID_EDEFAULT = "";
-
- /**
- * The cached value of the '{@link #getID() <em>ID</em>}' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getID()
- * @generated
- * @ordered
- */
- protected String id = ID_EDEFAULT;
-
- /**
- * The default value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getName()
- * @generated
- * @ordered
- */
- protected static final String NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getName()
- * @generated
- * @ordered
- */
- protected String name = NAME_EDEFAULT;
-
- /**
- * The default value of the '{@link #isDeployed() <em>Deployed</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #isDeployed()
- * @generated
- * @ordered
- */
- protected static final boolean DEPLOYED_EDEFAULT = true;
-
- /**
- * The cached value of the '{@link #isDeployed() <em>Deployed</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #isDeployed()
- * @generated
- * @ordered
- */
- protected boolean deployed = DEPLOYED_EDEFAULT;
-
- /**
- * The default value of the '{@link #isImplementation()
- * <em>Implementation</em>}' attribute. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @see #isImplementation()
- * @generated
- * @ordered
- */
- protected static final boolean IMPLEMENTATION_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #getArchiveFiles()
- * <em>Archive Files</em>}' containment reference list. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @see #getArchiveFiles()
- * @generated
- * @ordered
- */
- protected EList<EObject> archiveFiles;
-
- /**
- * <!-- begin-user-doc --> Enhanced to not only create an instance but also
- * to set an initial ID (which can be reset later) and to add the
- * MaintainDefaultImplementationAdapter to the list of adapters. <!--
- * end-user-doc -->
- *
- * @generated NOT
- */
- protected JAXRSLibraryImpl() {
- super();
- // //set initial ID; will be overwritten from XML if already persisted
- // setID(String.valueOf(System.currentTimeMillis()));
- // add adapter to maintain a default implementation
- eAdapters().add(MaintainDefaultImplementationAdapter.getInstance());
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the static eClass <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return JAXRSLibraryRegistryPackage.Literals.JAXRS_LIBRARY;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public String getID() {
- return getName();
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the name <!-- end-user-doc -->
- * @generated
- */
- public String getName() {
- return name;
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @param newName
- * <!-- end-user-doc -->
- * @generated
- */
- public void setName(String newName) {
- String oldName = name;
- name = newName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- JAXRSLibraryRegistryPackage.JAXRS_LIBRARY__NAME, oldName,
- name));
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return true if library is to be deployed <!-- end-user-doc -->
- * @generated
- */
- public boolean isDeployed() {
- return deployed;
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @param newDeployed
- * <!-- end-user-doc -->
- * @generated
- */
- public void setDeployed(boolean newDeployed) {
- boolean oldDeployed = deployed;
- deployed = newDeployed;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- JAXRSLibraryRegistryPackage.JAXRS_LIBRARY__DEPLOYED,
- oldDeployed, deployed));
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the list of archive files <!-- end-user-doc -->
- * @generated
- */
- public EList<EObject> getArchiveFiles() {
- if (archiveFiles == null) {
- archiveFiles = new EObjectContainmentWithInverseEList<EObject>(
- ArchiveFile.class, this,
- JAXRSLibraryRegistryPackage.JAXRS_LIBRARY__ARCHIVE_FILES,
- JAXRSLibraryRegistryPackage.ARCHIVE_FILE__JAXRS_LIBRARY);
- }
- return archiveFiles;
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @param fullPath
- * @return the true if the fullPath contains an archive file <!--
- * end-user-doc -->
- * @generated NOT
- */
- public boolean containsArchiveFile(String fullPath) {
- boolean contains = false;
- if (fullPath != null) {
- Iterator<EObject> itArchiveFiles = getArchiveFiles().iterator();
- while (itArchiveFiles.hasNext()) {
- ArchiveFile archiveFile = (ArchiveFile) itArchiveFiles.next();
- if (fullPath.equals(archiveFile.getResolvedSourceLocation())) {
- contains = true;
- break;
- }
- }
- }
- return contains;
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the working copy <!-- end-user-doc -->
- * @generated NOT
- */
- @SuppressWarnings("unchecked")
- public JAXRSLibrary getWorkingCopy() {
- JAXRSLibrary workingCopyLib = JAXRSLibraryRegistryFactory.eINSTANCE
- .createJAXRSLibrary();
- // workingCopyLib.setID(getID());
- workingCopyLib.setName(getName());
- workingCopyLib.setDeployed(isDeployed());
- Iterator<EObject> itArchiveFiles = getArchiveFiles().iterator();
- while (itArchiveFiles.hasNext()) {
- ArchiveFile srcArchiveFile = (ArchiveFile) itArchiveFiles.next();
- ArchiveFile destArchiveFile = JAXRSLibraryRegistryFactory.eINSTANCE
- .createArchiveFile();
- destArchiveFile.setRelativeToWorkspace(srcArchiveFile
- .isRelativeToWorkspace());
- destArchiveFile.setSourceLocation(srcArchiveFile
- .getSourceLocation());
- destArchiveFile.setRelativeDestLocation(srcArchiveFile
- .getRelativeDestLocation());
- workingCopyLib.getArchiveFiles().add(destArchiveFile);
- }
- return workingCopyLib;
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @param otherLibrary
- * <!-- end-user-doc -->
- * @generated NOT
- */
- @SuppressWarnings("unchecked")
- public void updateValues(JAXRSLibrary otherLibrary) {
- if (otherLibrary != null) {
- // setID(otherLibrary.getID());
- setName(otherLibrary.getName());
- setDeployed(otherLibrary.isDeployed());
- Iterator<EObject> itArchiveFiles = otherLibrary.getArchiveFiles()
- .iterator();
- getArchiveFiles().clear();
- while (itArchiveFiles.hasNext()) {
- ArchiveFile srcArchiveFile = (ArchiveFile) itArchiveFiles
- .next();
- ArchiveFile destArchiveFile = JAXRSLibraryRegistryFactory.eINSTANCE
- .createArchiveFile();
- destArchiveFile.setRelativeToWorkspace(srcArchiveFile
- .isRelativeToWorkspace());
- destArchiveFile.setSourceLocation(srcArchiveFile
- .getSourceLocation());
- destArchiveFile.setRelativeDestLocation(srcArchiveFile
- .getRelativeDestLocation());
- getArchiveFiles().add(destArchiveFile);
- }
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @param baseDestLocation
- * @return the base destination location <!-- end-user-doc -->
- * @generated NOT
- */
- public boolean copyTo(String baseDestLocation) {
- boolean allCopied = true;
- Iterator<EObject> itFiles = getArchiveFiles().iterator();
- while (itFiles.hasNext()) {
- ArchiveFile archiveFile = (ArchiveFile) itFiles.next();
- boolean copied = archiveFile.copyTo(baseDestLocation);
- allCopied = allCopied && copied;
- }
- return allCopied;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public String getLabel() {
- return getName();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain eInverseAdd(InternalEObject otherEnd,
- int featureID, NotificationChain msgs) {
- switch (featureID) {
- case JAXRSLibraryRegistryPackage.JAXRS_LIBRARY__ARCHIVE_FILES:
- return ((InternalEList<EObject>) getArchiveFiles()).basicAdd(
- otherEnd, msgs);
- }
- return super.eInverseAdd(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd,
- int featureID, NotificationChain msgs) {
- switch (featureID) {
- case JAXRSLibraryRegistryPackage.JAXRS_LIBRARY__ARCHIVE_FILES:
- return ((InternalEList<EObject>) getArchiveFiles()).basicRemove(
- otherEnd, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case JAXRSLibraryRegistryPackage.JAXRS_LIBRARY__ID:
- return getID();
- case JAXRSLibraryRegistryPackage.JAXRS_LIBRARY__NAME:
- return getName();
- case JAXRSLibraryRegistryPackage.JAXRS_LIBRARY__DEPLOYED:
- return isDeployed() ? Boolean.TRUE : Boolean.FALSE;
- case JAXRSLibraryRegistryPackage.JAXRS_LIBRARY__ARCHIVE_FILES:
- return getArchiveFiles();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @SuppressWarnings("unchecked")
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case JAXRSLibraryRegistryPackage.JAXRS_LIBRARY__NAME:
- setName((String) newValue);
- return;
- case JAXRSLibraryRegistryPackage.JAXRS_LIBRARY__DEPLOYED:
- setDeployed(((Boolean) newValue).booleanValue());
- return;
- case JAXRSLibraryRegistryPackage.JAXRS_LIBRARY__ARCHIVE_FILES:
- getArchiveFiles().clear();
- getArchiveFiles().addAll((Collection) newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case JAXRSLibraryRegistryPackage.JAXRS_LIBRARY__NAME:
- setName(NAME_EDEFAULT);
- return;
- case JAXRSLibraryRegistryPackage.JAXRS_LIBRARY__DEPLOYED:
- setDeployed(DEPLOYED_EDEFAULT);
- return;
- case JAXRSLibraryRegistryPackage.JAXRS_LIBRARY__ARCHIVE_FILES:
- getArchiveFiles().clear();
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case JAXRSLibraryRegistryPackage.JAXRS_LIBRARY__ID:
- return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
- case JAXRSLibraryRegistryPackage.JAXRS_LIBRARY__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT
- .equals(name);
- case JAXRSLibraryRegistryPackage.JAXRS_LIBRARY__DEPLOYED:
- return deployed != DEPLOYED_EDEFAULT;
- case JAXRSLibraryRegistryPackage.JAXRS_LIBRARY__ARCHIVE_FILES:
- return archiveFiles != null && !archiveFiles.isEmpty();
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the string representation <!-- end-user-doc -->
- * @generated
- */
- public String toString() {
- if (eIsProxy())
- return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (ID: ");
- result.append(id);
- result.append(", Name: ");
- result.append(name);
- result.append(", Deployed: ");
- result.append(deployed);
- result.append(')');
- return result.toString();
- }
-
-} // JAXRSLibraryImpl
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryregistry/impl/JAXRSLibraryRegistryFactoryImpl.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryregistry/impl/JAXRSLibraryRegistryFactoryImpl.java
deleted file mode 100644
index ab97fa7..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryregistry/impl/JAXRSLibraryRegistryFactoryImpl.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100420 309846 ericdp@ca.ibm.com - Eric D. Peters, Remove dead code related to e.p. pluginProvidedJaxrsLibraries
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.ArchiveFile;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibrary;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistry;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistryFactory;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistryPackage;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.PluginProvidedJAXRSLibrary;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--
- * end-user-doc -->
- *
- * @generated
- *
- * @deprecated
- *
- * <p>
- * <b>Provisional API - subject to change - do not use</b>
- * </p>
- */
-public class JAXRSLibraryRegistryFactoryImpl extends EFactoryImpl implements
- JAXRSLibraryRegistryFactory {
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-
- /**
- * Creates the default factory implementation. <!-- begin-user-doc -->
- *
- * @return the initialized factory <!-- end-user-doc -->
- * @generated
- */
- public static JAXRSLibraryRegistryFactory init() {
- try {
- JAXRSLibraryRegistryFactory theJAXRSLibraryRegistryFactory = (JAXRSLibraryRegistryFactory) EPackage.Registry.INSTANCE
- .getEFactory("http://www.eclipse.org/webtools/jaxrs/schema/JAXRSLibraryregistry.xsd");
- if (theJAXRSLibraryRegistryFactory != null) {
- return theJAXRSLibraryRegistryFactory;
- }
- } catch (Exception exception) {
- EcorePlugin.INSTANCE.log(exception);
- }
- return new JAXRSLibraryRegistryFactoryImpl();
- }
-
- /**
- * Creates an instance of the factory. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public JAXRSLibraryRegistryFactoryImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @param eClass
- * @return the static eclass <!-- end-user-doc -->
- * @generated
- */
- public EObject create(EClass eClass) {
- switch (eClass.getClassifierID()) {
- case JAXRSLibraryRegistryPackage.JAXRS_LIBRARY_REGISTRY:
- return createJAXRSLibraryRegistry();
- case JAXRSLibraryRegistryPackage.JAXRS_LIBRARY:
- return createJAXRSLibrary();
- case JAXRSLibraryRegistryPackage.PLUGIN_PROVIDED_JAXRS_LIBRARY:
- return createPluginProvidedJAXRSLibrary();
- case JAXRSLibraryRegistryPackage.ARCHIVE_FILE:
- return createArchiveFile();
- default:
- throw new IllegalArgumentException("The class '" + eClass.getName()
- + "' is not a valid classifier");
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the JAXRS Library registry <!-- end-user-doc -->
- * @generated
- */
- public JAXRSLibraryRegistry createJAXRSLibraryRegistry() {
- JAXRSLibraryRegistryImpl JAXRSLibraryRegistry = new JAXRSLibraryRegistryImpl();
- return JAXRSLibraryRegistry;
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the JAXRS Library <!-- end-user-doc -->
- * @generated
- */
- public JAXRSLibrary createJAXRSLibrary() {
- JAXRSLibraryImpl JAXRSLibrary = new JAXRSLibraryImpl();
- return JAXRSLibrary;
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the archive file <!-- end-user-doc -->
- * @generated
- */
- public ArchiveFile createArchiveFile() {
- ArchiveFileImpl archiveFile = new ArchiveFileImpl();
- return archiveFile;
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the plugin provided JAXRS Library <!-- end-user-doc -->
- * @generated
- */
- public PluginProvidedJAXRSLibrary createPluginProvidedJAXRSLibrary() {
- PluginProvidedJAXRSLibraryImpl pluginProvidedJAXRSLibrary = new PluginProvidedJAXRSLibraryImpl();
- return pluginProvidedJAXRSLibrary;
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the registry package <!-- end-user-doc -->
- * @generated
- */
- public JAXRSLibraryRegistryPackage getJAXRSLibraryRegistryPackage() {
- return (JAXRSLibraryRegistryPackage) getEPackage();
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the package <!-- end-user-doc -->
- * @deprecated
- * @generated
- */
- public static JAXRSLibraryRegistryPackage getPackage() {
- return JAXRSLibraryRegistryPackage.eINSTANCE;
- }
-
-} // JAXRSLibraryRegistryFactoryImpl
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryregistry/impl/JAXRSLibraryRegistryImpl.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryregistry/impl/JAXRSLibraryRegistryImpl.java
deleted file mode 100644
index 147276a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryregistry/impl/JAXRSLibraryRegistryImpl.java
+++ /dev/null
@@ -1,446 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100420 309846 ericdp@ca.ibm.com - Eric D. Peters, Remove dead code related to e.p. pluginProvidedJaxrsLibraries
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistry;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistryPackage;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibrary;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.PluginProvidedJAXRSLibrary;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>JAXRS Library Registry</b></em>'. <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.JAXRSLibraryRegistryImpl#getDefaultImplementationID
- * <em>Default Implementation ID</em>}</li>
- * <li>
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.JAXRSLibraryRegistryImpl#getJAXRSLibraries
- * <em>JAXRS Libraries</em>}</li>
- * <li>
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.JAXRSLibraryRegistryImpl#getPluginProvidedJAXRSLibraries
- * <em>Plugin Provided JAXRS Libraries</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- *
- * @deprecated
- *
- * <p>
- * <b>Provisional API - subject to change - do not use</b>
- * </p>
- */
-public class JAXRSLibraryRegistryImpl extends EObjectImpl implements
- JAXRSLibraryRegistry {
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-
- /**
- * The default value of the '{@link #getDefaultImplementationID()
- * <em>Default Implementation ID</em>}' attribute. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getDefaultImplementationID()
- * @generated
- * @ordered
- */
- protected static final String DEFAULT_IMPLEMENTATION_ID_EDEFAULT = "";
-
- /**
- * The cached value of the '{@link #getDefaultImplementationID()
- * <em>Default Implementation ID</em>}' attribute. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getDefaultImplementationID()
- * @generated
- * @ordered
- */
- protected String defaultImplementationID = DEFAULT_IMPLEMENTATION_ID_EDEFAULT;
-
- /**
- * The cached value of the '{@link #getJAXRSLibraries()
- * <em>JAXRS Libraries</em>}' containment reference list. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getJAXRSLibraries()
- * @generated
- * @ordered
- */
- protected EList<JAXRSLibrary> jaxrsLibraries;
-
- /**
- * The cached value of the '{@link #getPluginProvidedJAXRSLibraries()
- * <em>Plugin Provided JAXRS Libraries</em>}' containment reference list.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getPluginProvidedJAXRSLibraries()
- * @generated
- * @ordered
- */
- protected EList<JAXRSLibrary> pluginProvidedJAXRSLibraries;
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected JAXRSLibraryRegistryImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the static eClass <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return JAXRSLibraryRegistryPackage.Literals.JAXRS_LIBRARY_REGISTRY;
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the default implementation id <!-- end-user-doc -->
- * @generated
- */
- public String getDefaultImplementationID() {
- return defaultImplementationID;
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @param newDefaultImplementationID
- * <!-- end-user-doc -->
- * @generated
- */
- public void setDefaultImplementationID(String newDefaultImplementationID) {
- String oldDefaultImplementationID = defaultImplementationID;
- defaultImplementationID = newDefaultImplementationID;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(
- this,
- Notification.SET,
- JAXRSLibraryRegistryPackage.JAXRS_LIBRARY_REGISTRY__DEFAULT_IMPLEMENTATION_ID,
- oldDefaultImplementationID, defaultImplementationID));
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the list of jaxrs libraries <!-- end-user-doc -->
- * @generated
- */
- public EList<JAXRSLibrary> getJAXRSLibraries() {
- if (jaxrsLibraries == null) {
- jaxrsLibraries = new EObjectContainmentEList<JAXRSLibrary>(
- JAXRSLibrary.class,
- this,
- JAXRSLibraryRegistryPackage.JAXRS_LIBRARY_REGISTRY__JAXRS_LIBRARIES);
- }
- return jaxrsLibraries;
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the list of plugin provided JAXRS libraries <!-- end-user-doc -->
- * @generated
- */
- public EList<JAXRSLibrary> getPluginProvidedJAXRSLibraries() {
- if (pluginProvidedJAXRSLibraries == null) {
- pluginProvidedJAXRSLibraries = new EObjectContainmentEList<JAXRSLibrary>(
- PluginProvidedJAXRSLibrary.class,
- this,
- JAXRSLibraryRegistryPackage.JAXRS_LIBRARY_REGISTRY__PLUGIN_PROVIDED_JAXRS_LIBRARIES);
- }
- return pluginProvidedJAXRSLibraries;
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the default implemention JAXRS Library <!-- end-user-doc -->
- * @generated NOT
- */
- public JAXRSLibrary getDefaultImplementation() {
- return getJAXRSLibraryByID(getDefaultImplementationID());
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @param implementation
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public void setDefaultImplementation(JAXRSLibrary implementation) {
- if (implementation != null) {
- setDefaultImplementationID(implementation.getID());
- } else {
- setDefaultImplementationID(null);
- }
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd,
- int featureID, NotificationChain msgs) {
- switch (featureID) {
- case JAXRSLibraryRegistryPackage.JAXRS_LIBRARY_REGISTRY__JAXRS_LIBRARIES:
- return ((InternalEList<JAXRSLibrary>) getJAXRSLibraries())
- .basicRemove(otherEnd, msgs);
- case JAXRSLibraryRegistryPackage.JAXRS_LIBRARY_REGISTRY__PLUGIN_PROVIDED_JAXRS_LIBRARIES:
- return ((InternalEList<JAXRSLibrary>) getPluginProvidedJAXRSLibraries())
- .basicRemove(otherEnd, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case JAXRSLibraryRegistryPackage.JAXRS_LIBRARY_REGISTRY__DEFAULT_IMPLEMENTATION_ID:
- return getDefaultImplementationID();
- case JAXRSLibraryRegistryPackage.JAXRS_LIBRARY_REGISTRY__JAXRS_LIBRARIES:
- return getJAXRSLibraries();
- case JAXRSLibraryRegistryPackage.JAXRS_LIBRARY_REGISTRY__PLUGIN_PROVIDED_JAXRS_LIBRARIES:
- return getPluginProvidedJAXRSLibraries();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @SuppressWarnings("unchecked")
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case JAXRSLibraryRegistryPackage.JAXRS_LIBRARY_REGISTRY__DEFAULT_IMPLEMENTATION_ID:
- setDefaultImplementationID((String) newValue);
- return;
- case JAXRSLibraryRegistryPackage.JAXRS_LIBRARY_REGISTRY__JAXRS_LIBRARIES:
- getJAXRSLibraries().clear();
- getJAXRSLibraries().addAll((Collection) newValue);
- return;
- case JAXRSLibraryRegistryPackage.JAXRS_LIBRARY_REGISTRY__PLUGIN_PROVIDED_JAXRS_LIBRARIES:
- getPluginProvidedJAXRSLibraries().clear();
- getPluginProvidedJAXRSLibraries().addAll((Collection) newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case JAXRSLibraryRegistryPackage.JAXRS_LIBRARY_REGISTRY__DEFAULT_IMPLEMENTATION_ID:
- setDefaultImplementationID(DEFAULT_IMPLEMENTATION_ID_EDEFAULT);
- return;
- case JAXRSLibraryRegistryPackage.JAXRS_LIBRARY_REGISTRY__JAXRS_LIBRARIES:
- getJAXRSLibraries().clear();
- return;
- case JAXRSLibraryRegistryPackage.JAXRS_LIBRARY_REGISTRY__PLUGIN_PROVIDED_JAXRS_LIBRARIES:
- getPluginProvidedJAXRSLibraries().clear();
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case JAXRSLibraryRegistryPackage.JAXRS_LIBRARY_REGISTRY__DEFAULT_IMPLEMENTATION_ID:
- return DEFAULT_IMPLEMENTATION_ID_EDEFAULT == null ? defaultImplementationID != null
- : !DEFAULT_IMPLEMENTATION_ID_EDEFAULT
- .equals(defaultImplementationID);
- case JAXRSLibraryRegistryPackage.JAXRS_LIBRARY_REGISTRY__JAXRS_LIBRARIES:
- return jaxrsLibraries != null && !jaxrsLibraries.isEmpty();
- case JAXRSLibraryRegistryPackage.JAXRS_LIBRARY_REGISTRY__PLUGIN_PROVIDED_JAXRS_LIBRARIES:
- return pluginProvidedJAXRSLibraries != null
- && !pluginProvidedJAXRSLibraries.isEmpty();
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @param ID
- * @return the JAXRS Library of ID or null if none <!-- end-user-doc -->
- * @generated NOT
- */
- public JAXRSLibrary getJAXRSLibraryByID(String ID) {
- JAXRSLibrary library = null;
- if (ID != null) {
- Iterator<JAXRSLibrary> itLibs = getAllJAXRSLibraries().iterator();
- while (itLibs.hasNext()) {
- JAXRSLibrary curLib = itLibs.next();
- if (ID.equals(curLib.getID())) {
- library = curLib;
- break;
- }
- }
- }
- return library;
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @param name
- * @return the list of libraries named 'name' <!-- end-user-doc -->
- * @generated NOT
- */
- public EList<JAXRSLibrary> getJAXRSLibrariesByName(String name) {
- EList<JAXRSLibrary> libraries = new BasicEList<JAXRSLibrary>();
- if (name != null) {
- Iterator<JAXRSLibrary> itLibs = getAllJAXRSLibraries().iterator();
- while (itLibs.hasNext()) {
- JAXRSLibrary curLib = itLibs.next();
- if (name.equals(curLib.getName())) {
- libraries.add(curLib);
- }
- }
- }
- return libraries;
- }
-
- /**
- * <!-- begin-user-doc --> This is a convenience method to return an EList
- * of JAXRSLibrary instances that are marked as JAXRS implementations; while
- * all instances are valid references, the returned EList should not be used
- * for additions and/or removals of instances (use the EList returned by
- * getJAXRSLibraries()).
- *
- * @return the list of implemention jaxrs libraries <!-- end-user-doc -->
- * @generated NOT
- */
- public EList<JAXRSLibrary> getImplJAXRSLibraries() {
- EList<JAXRSLibrary> implementations = new BasicEList<JAXRSLibrary>();
- Iterator<JAXRSLibrary> itLibs = getAllJAXRSLibraries().iterator();
- while (itLibs.hasNext()) {
- JAXRSLibrary lib = itLibs.next();
- implementations.add(lib);
- }
- return implementations;
- }
-
- /**
- * <!-- begin-user-doc --> This is a convenience method to return an EList
- * of JAXRSLibrary instances and PluginProvidedJAXRSLibrary instances; while
- * all instances are valid references, the returned EList should not be used
- * for additions and/or removals of instances (use the EList returned by
- * getJAXRSLibraries()).
- *
- * @return all JAXRS libraries <!-- end-user-doc -->
- * @generated NOT
- */
- public EList<JAXRSLibrary> getAllJAXRSLibraries() {
- EList<JAXRSLibrary> allLibs = new BasicEList<JAXRSLibrary>();
- allLibs.addAll(getJAXRSLibraries());
- allLibs.addAll(getPluginProvidedJAXRSLibraries());
- return allLibs;
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @param library
- * @return true if library is successfully added <!-- end-user-doc -->
- * @generated NOT
- */
- public boolean addJAXRSLibrary(JAXRSLibrary library) {
- boolean added = false;
- if (library instanceof PluginProvidedJAXRSLibrary) {
- added = getPluginProvidedJAXRSLibraries().add(library);
- } else {
- added = getJAXRSLibraries().add(library);
- }
- return added;
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @param library
- * @return true if library is successfully removed <!-- end-user-doc -->
- * @generated NOT
- */
- public boolean removeJAXRSLibrary(JAXRSLibrary library) {
- boolean removed = false;
- if (library instanceof PluginProvidedJAXRSLibrary) {
- removed = getPluginProvidedJAXRSLibraries().remove(library);
- } else {
- removed = getJAXRSLibraries().remove(library);
- }
- return removed;
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the string representation <!-- end-user-doc -->
- * @generated
- */
- public String toString() {
- if (eIsProxy())
- return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (DefaultImplementationID: ");
- result.append(defaultImplementationID);
- result.append(')');
- return result.toString();
- }
-
-} // JAXRSLibraryRegistryImpl
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryregistry/impl/JAXRSLibraryRegistryPackageImpl.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryregistry/impl/JAXRSLibraryRegistryPackageImpl.java
deleted file mode 100644
index 01292a2..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryregistry/impl/JAXRSLibraryRegistryPackageImpl.java
+++ /dev/null
@@ -1,563 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100420 309846 ericdp@ca.ibm.com - Eric D. Peters, Remove dead code related to e.p. pluginProvidedJaxrsLibraries
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.ArchiveFile;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibrary;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistry;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistryFactory;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistryPackage;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.PluginProvidedJAXRSLibrary;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--
- * end-user-doc -->
- *
- * @generated
- *
- * @deprecated
- *
- * <p>
- * <b>Provisional API - subject to change - do not use</b>
- * </p>
- */
-public class JAXRSLibraryRegistryPackageImpl extends EPackageImpl implements
- JAXRSLibraryRegistryPackage {
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass JAXRSLibraryRegistryEClass = null;
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass JAXRSLibraryEClass = null;
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass archiveFileEClass = null;
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass pluginProvidedJAXRSLibraryEClass = null;
-
- /**
- * Creates an instance of the model <b>Package</b>, registered with
- * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
- * package package URI value.
- * <p>
- * Note: the correct way to create the package is via the static factory
- * method {@link #init init()}, which also performs initialization of the
- * package, or returns the registered package, if one already exists. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @see org.eclipse.emf.ecore.EPackage.Registry
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistryPackage#eNS_URI
- * @see #init()
- * @generated
- */
- private JAXRSLibraryRegistryPackageImpl() {
- super(eNS_URI, JAXRSLibraryRegistryFactory.eINSTANCE);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- private static boolean isInited = false;
-
- /**
- * Creates, registers, and initializes the <b>Package</b> for this model,
- * and for any others upon which it depends. Simple dependencies are
- * satisfied by calling this method on all dependent packages before doing
- * anything else. This method drives initialization for interdependent
- * packages directly, in parallel with this package, itself.
- * <p>
- * Of this package and its interdependencies, all packages which have not
- * yet been registered by their URI values are first created and registered.
- * The packages are then initialized in two steps: meta-model objects for
- * all of the packages are created before any are initialized, since one
- * package's meta-model objects may refer to those of another.
- * <p>
- * Invocation of this method will not affect any packages that have already
- * been initialized. <!-- begin-user-doc -->
- *
- * @return the JAXRS Library registry package <!-- end-user-doc -->
- * @see #eNS_URI
- * @see #createPackageContents()
- * @see #initializePackageContents()
- * @generated
- */
- public static JAXRSLibraryRegistryPackage init() {
- if (isInited)
- return (JAXRSLibraryRegistryPackage) EPackage.Registry.INSTANCE
- .getEPackage(JAXRSLibraryRegistryPackage.eNS_URI);
-
- // Obtain or create and register package
- JAXRSLibraryRegistryPackageImpl theJAXRSLibraryRegistryPackage = (JAXRSLibraryRegistryPackageImpl) (EPackage.Registry.INSTANCE
- .getEPackage(eNS_URI) instanceof JAXRSLibraryRegistryPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(eNS_URI)
- : new JAXRSLibraryRegistryPackageImpl());
-
- isInited = true;
-
- // Create package meta-data objects
- theJAXRSLibraryRegistryPackage.createPackageContents();
-
- // Initialize created meta-data
- theJAXRSLibraryRegistryPackage.initializePackageContents();
-
- // Mark meta-data to indicate it can't be changed
- theJAXRSLibraryRegistryPackage.freeze();
-
- return theJAXRSLibraryRegistryPackage;
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the eclass <!-- end-user-doc -->
- * @generated
- */
- public EClass getJAXRSLibraryRegistry() {
- return JAXRSLibraryRegistryEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the eattribute <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getJAXRSLibraryRegistry_DefaultImplementationID() {
- return (EAttribute) JAXRSLibraryRegistryEClass.getEStructuralFeatures()
- .get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the ereference <!-- end-user-doc -->
- * @generated
- */
- public EReference getJAXRSLibraryRegistry_JAXRSLibraries() {
- return (EReference) JAXRSLibraryRegistryEClass.getEStructuralFeatures()
- .get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the ereference <!-- end-user-doc -->
- * @generated
- */
- public EReference getJAXRSLibraryRegistry_PluginProvidedJAXRSLibraries() {
- return (EReference) JAXRSLibraryRegistryEClass.getEStructuralFeatures()
- .get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the eclass <!-- end-user-doc -->
- * @generated
- */
- public EClass getJAXRSLibrary() {
- return JAXRSLibraryEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the eattribute <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getJAXRSLibrary_ID() {
- return (EAttribute) JAXRSLibraryEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the eattribute <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getJAXRSLibrary_Name() {
- return (EAttribute) JAXRSLibraryEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the eattribute <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getJAXRSLibrary_Deployed() {
- return (EAttribute) JAXRSLibraryEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the ereference <!-- end-user-doc -->
- * @generated
- */
- public EReference getJAXRSLibrary_ArchiveFiles() {
- return (EReference) JAXRSLibraryEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the eclass <!-- end-user-doc -->
- * @generated
- */
- public EClass getArchiveFile() {
- return archiveFileEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the eattribute <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getArchiveFile_SourceLocation() {
- return (EAttribute) archiveFileEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the eattribute <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getArchiveFile_RelativeToWorkspace() {
- return (EAttribute) archiveFileEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the eattribute <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getArchiveFile_RelativeDestLocation() {
- return (EAttribute) archiveFileEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the ereference <!-- end-user-doc -->
- * @generated
- */
- public EReference getArchiveFile_JAXRSLibrary() {
- return (EReference) archiveFileEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the eclass <!-- end-user-doc -->
- * @generated
- */
- public EClass getPluginProvidedJAXRSLibrary() {
- return pluginProvidedJAXRSLibraryEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the eattribute <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getPluginProvidedJAXRSLibrary_PluginID() {
- return (EAttribute) pluginProvidedJAXRSLibraryEClass
- .getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPluginProvidedJAXRSLibrary_Label() {
- return (EAttribute) pluginProvidedJAXRSLibraryEClass
- .getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the JAXRS Library registry factory <!-- end-user-doc -->
- * @generated
- */
- public JAXRSLibraryRegistryFactory getJAXRSLibraryRegistryFactory() {
- return (JAXRSLibraryRegistryFactory) getEFactoryInstance();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- private boolean isCreated = false;
-
- /**
- * Creates the meta-model objects for the package. This method is guarded to
- * have no affect on any invocation but its first. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void createPackageContents() {
- if (isCreated)
- return;
- isCreated = true;
-
- // Create classes and their features
- JAXRSLibraryRegistryEClass = createEClass(JAXRS_LIBRARY_REGISTRY);
- createEAttribute(JAXRSLibraryRegistryEClass,
- JAXRS_LIBRARY_REGISTRY__DEFAULT_IMPLEMENTATION_ID);
- createEReference(JAXRSLibraryRegistryEClass,
- JAXRS_LIBRARY_REGISTRY__JAXRS_LIBRARIES);
- createEReference(JAXRSLibraryRegistryEClass,
- JAXRS_LIBRARY_REGISTRY__PLUGIN_PROVIDED_JAXRS_LIBRARIES);
-
- JAXRSLibraryEClass = createEClass(JAXRS_LIBRARY);
- createEAttribute(JAXRSLibraryEClass, JAXRS_LIBRARY__ID);
- createEAttribute(JAXRSLibraryEClass, JAXRS_LIBRARY__NAME);
- createEAttribute(JAXRSLibraryEClass, JAXRS_LIBRARY__DEPLOYED);
- createEReference(JAXRSLibraryEClass, JAXRS_LIBRARY__ARCHIVE_FILES);
-
- pluginProvidedJAXRSLibraryEClass = createEClass(PLUGIN_PROVIDED_JAXRS_LIBRARY);
- createEAttribute(pluginProvidedJAXRSLibraryEClass,
- PLUGIN_PROVIDED_JAXRS_LIBRARY__PLUGIN_ID);
- createEAttribute(pluginProvidedJAXRSLibraryEClass,
- PLUGIN_PROVIDED_JAXRS_LIBRARY__LABEL);
-
- archiveFileEClass = createEClass(ARCHIVE_FILE);
- createEAttribute(archiveFileEClass, ARCHIVE_FILE__RELATIVE_TO_WORKSPACE);
- createEAttribute(archiveFileEClass, ARCHIVE_FILE__SOURCE_LOCATION);
- createEAttribute(archiveFileEClass,
- ARCHIVE_FILE__RELATIVE_DEST_LOCATION);
- createEReference(archiveFileEClass, ARCHIVE_FILE__JAXRS_LIBRARY);
-
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- private boolean isInitialized = false;
-
- /**
- * Complete the initialization of the package and its meta-model. This
- * method is guarded to have no affect on any invocation but its first. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void initializePackageContents() {
- if (isInitialized)
- return;
- isInitialized = true;
-
- // Initialize package
- setName(eNAME);
- setNsPrefix(eNS_PREFIX);
- setNsURI(eNS_URI);
-
- // Add supertypes to classes
- pluginProvidedJAXRSLibraryEClass.getESuperTypes().add(
- this.getJAXRSLibrary());
-
- // Initialize classes and features; add operations and parameters
- initEClass(JAXRSLibraryRegistryEClass, JAXRSLibraryRegistry.class,
- "JAXRSLibraryRegistry", !IS_ABSTRACT, !IS_INTERFACE,
- IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getJAXRSLibraryRegistry_DefaultImplementationID(),
- ecorePackage.getEString(), "DefaultImplementationID", "", 0, 1,
- JAXRSLibraryRegistry.class, !IS_TRANSIENT, !IS_VOLATILE,
- IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
- IS_ORDERED);
- initEReference(getJAXRSLibraryRegistry_JAXRSLibraries(), this
- .getJAXRSLibrary(), null, "JAXRSLibraries", null, 0, -1,
- JAXRSLibraryRegistry.class, !IS_TRANSIENT, !IS_VOLATILE,
- IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
- !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getJAXRSLibraryRegistry_PluginProvidedJAXRSLibraries(),
- this.getPluginProvidedJAXRSLibrary(), null,
- "PluginProvidedJAXRSLibraries", null, 0, -1,
- JAXRSLibraryRegistry.class, IS_TRANSIENT, !IS_VOLATILE,
- IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
- !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- EOperation op = addEOperation(JAXRSLibraryRegistryEClass, this
- .getJAXRSLibrary(), "getJAXRSLibraryByID", 1, 1);
- addEParameter(op, ecorePackage.getEString(), "ID", 1, 1);
-
- op = addEOperation(JAXRSLibraryRegistryEClass,
- ecorePackage.getEEList(), "getJAXRSLibrariesByName", 1, 1);
- addEParameter(op, ecorePackage.getEString(), "name", 1, 1);
-
- addEOperation(JAXRSLibraryRegistryEClass, ecorePackage.getEEList(),
- "getImplJAXRSLibraries", 1, 1);
-
- addEOperation(JAXRSLibraryRegistryEClass, ecorePackage.getEEList(),
- "getNonImplJAXRSLibraries", 1, 1);
-
- addEOperation(JAXRSLibraryRegistryEClass, ecorePackage.getEEList(),
- "getAllJAXRSLibraries", 1, 1);
-
- op = addEOperation(JAXRSLibraryRegistryEClass, ecorePackage
- .getEBoolean(), "addJAXRSLibrary", 1, 1);
- addEParameter(op, this.getJAXRSLibrary(), "library", 1, 1);
-
- op = addEOperation(JAXRSLibraryRegistryEClass, ecorePackage
- .getEBoolean(), "removeJAXRSLibrary", 1, 1);
- addEParameter(op, this.getJAXRSLibrary(), "library", 1, 1);
-
- addEOperation(JAXRSLibraryRegistryEClass, this.getJAXRSLibrary(),
- "getDefaultImplementation", 1, 1);
-
- op = addEOperation(JAXRSLibraryRegistryEClass, null,
- "setDefaultImplementation");
- addEParameter(op, this.getJAXRSLibrary(), "implementation", 1, 1);
-
- initEClass(JAXRSLibraryEClass, JAXRSLibrary.class, "JAXRSLibrary",
- !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getJAXRSLibrary_ID(), ecorePackage.getEString(), "ID",
- "", 0, 1, JAXRSLibrary.class, IS_TRANSIENT, !IS_VOLATILE,
- !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED,
- IS_ORDERED);
- initEAttribute(getJAXRSLibrary_Name(), ecorePackage.getEString(),
- "Name", null, 1, 1, JAXRSLibrary.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEAttribute(getJAXRSLibrary_Deployed(), ecorePackage.getEBoolean(),
- "Deployed", "true", 1, 1, JAXRSLibrary.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEReference(getJAXRSLibrary_ArchiveFiles(), this.getArchiveFile(),
- this.getArchiveFile_JAXRSLibrary(), "ArchiveFiles", null, 0,
- -1, JAXRSLibrary.class, !IS_TRANSIENT, !IS_VOLATILE,
- IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
- !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- op = addEOperation(JAXRSLibraryEClass, ecorePackage.getEBoolean(),
- "containsArchiveFile", 1, 1);
- addEParameter(op, ecorePackage.getEString(), "fullPath", 1, 1);
-
- addEOperation(JAXRSLibraryEClass, this.getJAXRSLibrary(),
- "getWorkingCopy", 1, 1);
-
- op = addEOperation(JAXRSLibraryEClass, null, "updateValues");
- addEParameter(op, this.getJAXRSLibrary(), "otherLibrary", 1, 1);
-
- op = addEOperation(JAXRSLibraryEClass, ecorePackage.getEBoolean(),
- "copyTo", 1, 1);
- addEParameter(op, ecorePackage.getEString(), "baseDestLocation", 1, 1);
-
- addEOperation(JAXRSLibraryEClass, ecorePackage.getEString(),
- "getLabel", 1, 1);
-
- initEClass(pluginProvidedJAXRSLibraryEClass,
- PluginProvidedJAXRSLibrary.class, "PluginProvidedJAXRSLibrary",
- !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getPluginProvidedJAXRSLibrary_PluginID(), ecorePackage
- .getEString(), "pluginID", null, 1, 1,
- PluginProvidedJAXRSLibrary.class, !IS_TRANSIENT, !IS_VOLATILE,
- IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
- IS_ORDERED);
- initEAttribute(getPluginProvidedJAXRSLibrary_Label(), ecorePackage
- .getEString(), "Label", null, 1, 1,
- PluginProvidedJAXRSLibrary.class, !IS_TRANSIENT, !IS_VOLATILE,
- IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
- IS_ORDERED);
-
- initEClass(archiveFileEClass, ArchiveFile.class, "ArchiveFile",
- !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getArchiveFile_RelativeToWorkspace(), ecorePackage
- .getEBoolean(), "RelativeToWorkspace", "true", 1, 1,
- ArchiveFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
- !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getArchiveFile_SourceLocation(), ecorePackage
- .getEString(), "SourceLocation", null, 1, 1, ArchiveFile.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
- !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getArchiveFile_RelativeDestLocation(), ecorePackage
- .getEString(), "RelativeDestLocation", null, 1, 1,
- ArchiveFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
- !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getArchiveFile_JAXRSLibrary(), this.getJAXRSLibrary(),
- this.getJAXRSLibrary_ArchiveFiles(), "JAXRSLibrary", null, 1,
- 1, ArchiveFile.class, !IS_TRANSIENT, !IS_VOLATILE,
- IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
- !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- addEOperation(archiveFileEClass, ecorePackage.getEString(), "getName",
- 1, 1);
-
- addEOperation(archiveFileEClass, ecorePackage.getEString(), "getPath",
- 1, 1);
-
- addEOperation(archiveFileEClass, ecorePackage.getEBoolean(), "exists",
- 1, 1);
-
- op = addEOperation(archiveFileEClass, ecorePackage.getEBoolean(),
- "equals", 1, 1);
- addEParameter(op, ecorePackage.getEJavaObject(), "object", 1, 1);
-
- addEOperation(archiveFileEClass, ecorePackage.getEInt(), "hashCode", 1,
- 1);
-
- op = addEOperation(archiveFileEClass, ecorePackage.getEBoolean(),
- "copyTo", 1, 1);
- addEParameter(op, ecorePackage.getEString(), "baseDestLocation", 1, 1);
-
- addEOperation(archiveFileEClass, ecorePackage.getEString(),
- "getResolvedSourceLocation", 1, 1);
-
- // Create resource
- createResource(eNS_URI);
- }
-
-} // JAXRSLibraryRegistryPackageImpl
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryregistry/impl/PluginProvidedJAXRSLibraryImpl.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryregistry/impl/PluginProvidedJAXRSLibraryImpl.java
deleted file mode 100644
index 2df2138..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryregistry/impl/PluginProvidedJAXRSLibraryImpl.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100420 309846 ericdp@ca.ibm.com - Eric D. Peters, Remove dead code related to e.p. pluginProvidedJaxrsLibraries
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl;
-
-import java.util.Iterator;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.ArchiveFile;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistryFactory;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistryPackage;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibrary;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.PluginProvidedJAXRSLibrary;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Plugin Provided JAXRS Library</b></em>'. <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.PluginProvidedJAXRSLibraryImpl#getPluginID
- * <em>Plugin ID</em>}</li>
- * <li>
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.impl.PluginProvidedJAXRSLibraryImpl#getLabel
- * <em>Label</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- *
- * @deprecated
- *
- * <p>
- * <b>Provisional API - subject to change - do not use</b>
- * </p>
- */
-public class PluginProvidedJAXRSLibraryImpl extends JAXRSLibraryImpl implements
- PluginProvidedJAXRSLibrary {
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-
- /**
- * The default value of the '{@link #getPluginID() <em>Plugin ID</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getPluginID()
- * @generated
- * @ordered
- */
- protected static final String PLUGIN_ID_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getPluginID() <em>Plugin ID</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getPluginID()
- * @generated
- * @ordered
- */
- protected String pluginID = PLUGIN_ID_EDEFAULT;
-
- /**
- * The default value of the '{@link #getLabel() <em>Label</em>}' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getLabel()
- * @generated
- * @ordered
- */
- protected static final String LABEL_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getLabel() <em>Label</em>}' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getLabel()
- * @generated
- * @ordered
- */
- protected String label = LABEL_EDEFAULT;
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected PluginProvidedJAXRSLibraryImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the static eclass <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return JAXRSLibraryRegistryPackage.Literals.PLUGIN_PROVIDED_JAXRS_LIBRARY;
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the plugin id <!-- end-user-doc -->
- * @generated
- */
- public String getPluginID() {
- return pluginID;
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @param newPluginID
- * <!-- end-user-doc -->
- * @generated
- */
- public void setPluginID(String newPluginID) {
- String oldPluginID = pluginID;
- pluginID = newPluginID;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(
- this,
- Notification.SET,
- JAXRSLibraryRegistryPackage.PLUGIN_PROVIDED_JAXRS_LIBRARY__PLUGIN_ID,
- oldPluginID, pluginID));
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return translatable label <!-- end-user-doc -->
- * @generated NOT
- */
- public String getLabel() {
- if (label == null)
- return super.getLabel();
- return label;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void setLabel(String newLabel) {
- String oldLabel = label;
- label = newLabel;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(
- this,
- Notification.SET,
- JAXRSLibraryRegistryPackage.PLUGIN_PROVIDED_JAXRS_LIBRARY__LABEL,
- oldLabel, label));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case JAXRSLibraryRegistryPackage.PLUGIN_PROVIDED_JAXRS_LIBRARY__PLUGIN_ID:
- return getPluginID();
- case JAXRSLibraryRegistryPackage.PLUGIN_PROVIDED_JAXRS_LIBRARY__LABEL:
- return getLabel();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case JAXRSLibraryRegistryPackage.PLUGIN_PROVIDED_JAXRS_LIBRARY__PLUGIN_ID:
- setPluginID((String) newValue);
- return;
- case JAXRSLibraryRegistryPackage.PLUGIN_PROVIDED_JAXRS_LIBRARY__LABEL:
- setLabel((String) newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case JAXRSLibraryRegistryPackage.PLUGIN_PROVIDED_JAXRS_LIBRARY__PLUGIN_ID:
- setPluginID(PLUGIN_ID_EDEFAULT);
- return;
- case JAXRSLibraryRegistryPackage.PLUGIN_PROVIDED_JAXRS_LIBRARY__LABEL:
- setLabel(LABEL_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case JAXRSLibraryRegistryPackage.PLUGIN_PROVIDED_JAXRS_LIBRARY__PLUGIN_ID:
- return PLUGIN_ID_EDEFAULT == null ? pluginID != null
- : !PLUGIN_ID_EDEFAULT.equals(pluginID);
- case JAXRSLibraryRegistryPackage.PLUGIN_PROVIDED_JAXRS_LIBRARY__LABEL:
- return LABEL_EDEFAULT == null ? label != null : !LABEL_EDEFAULT
- .equals(label);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public String getID() {
- return getPluginID() + ID_SEPARATOR + getName();
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the working copy <!-- end-user-doc -->
- * @generated NOT
- */
- @SuppressWarnings("unchecked")
- public JAXRSLibrary getWorkingCopy() {
- PluginProvidedJAXRSLibrary workingCopyLib = JAXRSLibraryRegistryFactory.eINSTANCE
- .createPluginProvidedJAXRSLibrary();
- workingCopyLib.setName(getName());
- if (label != null)
- workingCopyLib.setLabel(getLabel());
- workingCopyLib.setDeployed(isDeployed());
- workingCopyLib.setPluginID(getPluginID());
- Iterator itArchiveFiles = getArchiveFiles().iterator();
- while (itArchiveFiles.hasNext()) {
- ArchiveFile srcArchiveFile = (ArchiveFile) itArchiveFiles.next();
- ArchiveFile destArchiveFile = JAXRSLibraryRegistryFactory.eINSTANCE
- .createArchiveFile();
- destArchiveFile.setRelativeToWorkspace(srcArchiveFile
- .isRelativeToWorkspace());
- destArchiveFile.setSourceLocation(srcArchiveFile
- .getSourceLocation());
- destArchiveFile.setRelativeDestLocation(srcArchiveFile
- .getRelativeDestLocation());
- workingCopyLib.getArchiveFiles().add(destArchiveFile);
- }
- return workingCopyLib;
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @return the string representation <!-- end-user-doc -->
- * @generated
- */
- public String toString() {
- if (eIsProxy())
- return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (pluginID: ");
- result.append(pluginID);
- result.append(", Label: ");
- result.append(label);
- result.append(')');
- return result.toString();
- }
-
-} // PluginProvidedJAXRSLibraryImpl
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryregistry/util/JAXRSLibraryRegistryAdapterFactory.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryregistry/util/JAXRSLibraryRegistryAdapterFactory.java
deleted file mode 100644
index 602edb6..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryregistry/util/JAXRSLibraryRegistryAdapterFactory.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100420 309846 ericdp@ca.ibm.com - Eric D. Peters, Remove dead code related to e.p. pluginProvidedJaxrsLibraries
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.ArchiveFile;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistry;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistryPackage;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibrary;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.PluginProvidedJAXRSLibrary;
-
-/**
- * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides
- * an adapter <code>createXXX</code> method for each class of the model. <!--
- * end-user-doc -->
- *
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistryPackage
- * @generated
- *
- * @deprecated
- *
- * <p>
- * <b>Provisional API - subject to change - do not use</b>
- * </p>
- */
-public class JAXRSLibraryRegistryAdapterFactory extends AdapterFactoryImpl {
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-
- /**
- * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected static JAXRSLibraryRegistryPackage modelPackage;
-
- /**
- * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public JAXRSLibraryRegistryAdapterFactory() {
- if (modelPackage == null) {
- modelPackage = JAXRSLibraryRegistryPackage.eINSTANCE;
- }
- }
-
- /**
- * Returns whether this factory is applicable for the type of the object.
- * <!-- begin-user-doc --> This implementation returns <code>true</code> if
- * the object is either the model's package or is an instance object of the
- * model.
- *
- * @param object
- * <!-- end-user-doc -->
- * @return whether this factory is applicable for the type of the object.
- * @generated
- */
- public boolean isFactoryForType(Object object) {
- if (object == modelPackage) {
- return true;
- }
- if (object instanceof EObject) {
- return ((EObject) object).eClass().getEPackage() == modelPackage;
- }
- return false;
- }
-
- /**
- * The switch the delegates to the <code>createXXX</code> methods. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected JAXRSLibraryRegistrySwitch modelSwitch = new JAXRSLibraryRegistrySwitch() {
- public Object caseJAXRSLibraryRegistry(JAXRSLibraryRegistry object) {
- return createJAXRSLibraryRegistryAdapter();
- }
-
- public Object caseJAXRSLibrary(JAXRSLibrary object) {
- return createJAXRSLibraryAdapter();
- }
-
- public Object casePluginProvidedJAXRSLibrary(
- PluginProvidedJAXRSLibrary object) {
- return createPluginProvidedJAXRSLibraryAdapter();
- }
-
- public Object caseArchiveFile(ArchiveFile object) {
- return createArchiveFileAdapter();
- }
-
- public Object defaultCase(EObject object) {
- return createEObjectAdapter();
- }
- };
-
- /**
- * Creates an adapter for the <code>target</code>. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @param target
- * the object to adapt.
- * @return the adapter for the <code>target</code>.
- * @generated
- */
- public Adapter createAdapter(Notifier target) {
- return (Adapter) modelSwitch.doSwitch((EObject) target);
- }
-
- /**
- * Creates a new adapter for an object of class '
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistry
- * <em>JAXRS Library Registry</em>}'. <!-- begin-user-doc --> This default
- * implementation returns null so that we can easily ignore cases; it's
- * useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- *
- * @return the new adapter.
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistry
- * @generated
- */
- public Adapter createJAXRSLibraryRegistryAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibrary
- * <em>JAXRS Library</em>}'. <!-- begin-user-doc --> This default
- * implementation returns null so that we can easily ignore cases; it's
- * useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- *
- * @return the new adapter.
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibrary
- * @generated
- */
- public Adapter createJAXRSLibraryAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.ArchiveFile
- * <em>Archive File</em>}'. <!-- begin-user-doc --> This default
- * implementation returns null so that we can easily ignore cases; it's
- * useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- *
- * @return the new adapter.
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.ArchiveFile
- * @generated
- */
- public Adapter createArchiveFileAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.PluginProvidedJAXRSLibrary
- * <em>Plugin Provided JAXRS Library</em>}'. <!-- begin-user-doc --> This
- * default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases
- * anyway. <!-- end-user-doc -->
- *
- * @return the new adapter.
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.PluginProvidedJAXRSLibrary
- * @generated
- */
- public Adapter createPluginProvidedJAXRSLibraryAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for the default case. <!-- begin-user-doc --> This
- * default implementation returns null. <!-- end-user-doc -->
- *
- * @return the new adapter.
- * @generated
- */
- public Adapter createEObjectAdapter() {
- return null;
- }
-
-} // JAXRSLibraryRegistryAdapterFactory
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryregistry/util/JAXRSLibraryRegistryResourceFactoryImpl.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryregistry/util/JAXRSLibraryRegistryResourceFactoryImpl.java
deleted file mode 100644
index 667290f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryregistry/util/JAXRSLibraryRegistryResourceFactoryImpl.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100420 309846 ericdp@ca.ibm.com - Eric D. Peters, Remove dead code related to e.p. pluginProvidedJaxrsLibraries
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.util;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
-/**
- * <!-- begin-user-doc --> The <b>Resource Factory</b> associated with the
- * package. <!-- end-user-doc -->
- *
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.util.JAXRSLibraryRegistryResourceImpl
- * @generated
- *
- * @deprecated
- *
- * <p>
- * <b>Provisional API - subject to change - do not use</b>
- * </p>
- */
-public class JAXRSLibraryRegistryResourceFactoryImpl extends
- ResourceFactoryImpl {
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-
- /**
- * Creates an instance of the resource factory. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public JAXRSLibraryRegistryResourceFactoryImpl() {
- super();
- }
-
- /**
- * Creates an instance of the resource. <!-- begin-user-doc -->
- *
- * @param uri
- * @return the Resource <!-- end-user-doc -->
- * @generated
- */
- public Resource createResource(URI uri) {
- Resource result = new JAXRSLibraryRegistryResourceImpl(uri);
- return result;
- }
-
-} // JAXRSLibraryRegistryResourceFactoryImpl
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryregistry/util/JAXRSLibraryRegistryResourceImpl.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryregistry/util/JAXRSLibraryRegistryResourceImpl.java
deleted file mode 100644
index e4eed67..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryregistry/util/JAXRSLibraryRegistryResourceImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100420 309846 ericdp@ca.ibm.com - Eric D. Peters, Remove dead code related to e.p. pluginProvidedJaxrsLibraries
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.util;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
-
-/**
- * <!-- begin-user-doc --> The <b>Resource </b> associated with the package.
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.util.JAXRSLibraryRegistryResourceFactoryImpl
- * @generated
- *
- * @deprecated
- *
- * <p>
- * <b>Provisional API - subject to change - do not use</b>
- * </p>
- */
-public class JAXRSLibraryRegistryResourceImpl extends XMLResourceImpl {
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-
- /**
- * Creates an instance of the resource. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @param uri
- * the URI of the new resource.
- * @generated
- */
- public JAXRSLibraryRegistryResourceImpl(URI uri) {
- super(uri);
- }
-
-} // JAXRSLibraryRegistryResourceImpl
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryregistry/util/JAXRSLibraryRegistrySwitch.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryregistry/util/JAXRSLibraryRegistrySwitch.java
deleted file mode 100644
index 1806e7d..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryregistry/util/JAXRSLibraryRegistrySwitch.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100420 309846 ericdp@ca.ibm.com - Eric D. Peters, Remove dead code related to e.p. pluginProvidedJaxrsLibraries
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.ArchiveFile;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistry;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistryPackage;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibrary;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.PluginProvidedJAXRSLibrary;
-
-/**
- * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance
- * hierarchy. It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object and proceeding up the
- * inheritance hierarchy until a non-null result is returned, which is the
- * result of the switch. <!-- end-user-doc -->
- *
- * @see org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistryPackage
- * @generated
- *
- * @deprecated
- *
- * <p>
- * <b>Provisional API - subject to change - do not use</b>
- * </p>
- */
-public class JAXRSLibraryRegistrySwitch {
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-
- /**
- * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected static JAXRSLibraryRegistryPackage modelPackage;
-
- /**
- * Creates an instance of the switch. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public JAXRSLibraryRegistrySwitch() {
- if (modelPackage == null) {
- modelPackage = JAXRSLibraryRegistryPackage.eINSTANCE;
- }
- }
-
- /**
- * Calls <code>caseXXX</code> for each class of the model until one returns
- * a non null result; it yields that result. <!-- begin-user-doc -->
- *
- * @param theEObject
- * <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code>
- * call.
- * @generated
- */
- public Object doSwitch(EObject theEObject) {
- return doSwitch(theEObject.eClass(), theEObject);
- }
-
- /**
- * Calls <code>caseXXX</code> for each class of the model until one returns
- * a non null result; it yields that result. <!-- begin-user-doc -->
- *
- * @param theEClass
- * @param theEObject
- * <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code>
- * call.
- * @generated
- */
- @SuppressWarnings("unchecked")
- protected Object doSwitch(EClass theEClass, EObject theEObject) {
- if (theEClass.eContainer() == modelPackage) {
- return doSwitch(theEClass.getClassifierID(), theEObject);
- }
- List eSuperTypes = theEClass.getESuperTypes();
- return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(
- (EClass) eSuperTypes.get(0), theEObject);
- }
-
- /**
- * Calls <code>caseXXX</code> for each class of the model until one returns
- * a non null result; it yields that result. <!-- begin-user-doc -->
- *
- * @param classifierID
- * @param theEObject
- * <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code>
- * call.
- * @generated
- */
- protected Object doSwitch(int classifierID, EObject theEObject) {
- switch (classifierID) {
- case JAXRSLibraryRegistryPackage.JAXRS_LIBRARY_REGISTRY: {
- JAXRSLibraryRegistry JAXRSLibraryRegistry = (JAXRSLibraryRegistry) theEObject;
- Object result = caseJAXRSLibraryRegistry(JAXRSLibraryRegistry);
- if (result == null)
- result = defaultCase(theEObject);
- return result;
- }
- case JAXRSLibraryRegistryPackage.JAXRS_LIBRARY: {
- JAXRSLibrary JAXRSLibrary = (JAXRSLibrary) theEObject;
- Object result = caseJAXRSLibrary(JAXRSLibrary);
- if (result == null)
- result = defaultCase(theEObject);
- return result;
- }
- case JAXRSLibraryRegistryPackage.PLUGIN_PROVIDED_JAXRS_LIBRARY: {
- PluginProvidedJAXRSLibrary pluginProvidedJAXRSLibrary = (PluginProvidedJAXRSLibrary) theEObject;
- Object result = casePluginProvidedJAXRSLibrary(pluginProvidedJAXRSLibrary);
- if (result == null)
- result = caseJAXRSLibrary(pluginProvidedJAXRSLibrary);
- if (result == null)
- result = defaultCase(theEObject);
- return result;
- }
- case JAXRSLibraryRegistryPackage.ARCHIVE_FILE: {
- ArchiveFile archiveFile = (ArchiveFile) theEObject;
- Object result = caseArchiveFile(archiveFile);
- if (result == null)
- result = defaultCase(theEObject);
- return result;
- }
- default:
- return defaultCase(theEObject);
- }
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '
- * <em>JAXRS Library Registry</em>'. <!-- begin-user-doc --> This
- * implementation returns null; returning a non-null result will terminate
- * the switch. <!-- end-user-doc -->
- *
- * @param object
- * the target of the switch.
- * @return the result of interpretting the object as an instance of '
- * <em>JAXRS Library Registry</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseJAXRSLibraryRegistry(JAXRSLibraryRegistry object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '
- * <em>JAXRS Library</em>'. <!-- begin-user-doc --> This implementation
- * returns null; returning a non-null result will terminate the switch. <!--
- * end-user-doc -->
- *
- * @param object
- * the target of the switch.
- * @return the result of interpretting the object as an instance of '
- * <em>JAXRS Library</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseJAXRSLibrary(JAXRSLibrary object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '
- * <em>Archive File</em>'. <!-- begin-user-doc --> This implementation
- * returns null; returning a non-null result will terminate the switch. <!--
- * end-user-doc -->
- *
- * @param object
- * the target of the switch.
- * @return the result of interpretting the object as an instance of '
- * <em>Archive File</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseArchiveFile(ArchiveFile object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '
- * <em>Plugin Provided JAXRS Library</em>'. <!-- begin-user-doc --> This
- * implementation returns null; returning a non-null result will terminate
- * the switch. <!-- end-user-doc -->
- *
- * @param object
- * the target of the switch.
- * @return the result of interpretting the object as an instance of '
- * <em>Plugin Provided JAXRS Library</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object casePluginProvidedJAXRSLibrary(
- PluginProvidedJAXRSLibrary object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '
- * <em>EObject</em>'. <!-- begin-user-doc --> This implementation returns
- * null; returning a non-null result will terminate the switch, but this is
- * the last case anyway. <!-- end-user-doc -->
- *
- * @param object
- * the target of the switch.
- * @return the result of interpretting the object as an instance of '
- * <em>EObject</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject)
- * @generated
- */
- public Object defaultCase(EObject object) {
- return null;
- }
-
-} // JAXRSLibraryRegistrySwitch
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryregistry/util/JAXRSLibraryRegistryXMLProcessor.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryregistry/util/JAXRSLibraryRegistryXMLProcessor.java
deleted file mode 100644
index 17e6da9..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryregistry/util/JAXRSLibraryRegistryXMLProcessor.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100420 309846 ericdp@ca.ibm.com - Eric D. Peters, Remove dead code related to e.p. pluginProvidedJaxrsLibraries
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryregistry.util;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistryPackage;
-
-/**
- * This class contains helper methods to serialize and deserialize XML documents
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- *
- * @deprecated
- *
- * <p>
- * <b>Provisional API - subject to change - do not use</b>
- * </p>
- */
-public class JAXRSLibraryRegistryXMLProcessor extends XMLProcessor {
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-
- /**
- * Public constructor to instantiate the helper. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public JAXRSLibraryRegistryXMLProcessor() {
- super((EPackage.Registry.INSTANCE));
- JAXRSLibraryRegistryPackage.eINSTANCE.eClass();
- }
-
- /**
- * Register for "*" and "xml" file extensions the
- * JAXRSLibraryRegistryResourceFactoryImpl factory. <!-- begin-user-doc -->
- *
- * @return Map of registrations <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("unchecked")
- protected Map getRegistrations() {
- if (registrations == null) {
- super.getRegistrations();
- registrations.put(XML_EXTENSION,
- new JAXRSLibraryRegistryResourceFactoryImpl());
- registrations.put(STAR_EXTENSION,
- new JAXRSLibraryRegistryResourceFactoryImpl());
- }
- return registrations;
- }
-
-} // JAXRSLibraryRegistryXMLProcessor
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrssharedlibraryconfig/JAXRSSharedLibConfiguratorDelegate.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrssharedlibraryconfig/JAXRSSharedLibConfiguratorDelegate.java
deleted file mode 100644
index c200345..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrssharedlibraryconfig/JAXRSSharedLibConfiguratorDelegate.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100303 291954 kchong@ca.ibm.com - Keith Chong, JAX-RS: Implement JAX-RS Facet
- * 20101123 330916 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS - facet install should consider Web project associated with multiple EARs
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.jaxrssharedlibraryconfig;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-public abstract class JAXRSSharedLibConfiguratorDelegate {
-
- /**
- * Constructs an instance.
- */
- public JAXRSSharedLibConfiguratorDelegate() {
- super();
- }
- /**
- * @deprecated - Use org.eclipse.jst.ws.jaxrs.core.internal.jaxrssharedlibraryconfig.JAXRSSharedLibConfiguratorDelegate.installSharedLibs(IProject, IProject, IProgressMonitor, List<String>)
- */
- protected abstract void installSharedLibs(IProject webProject, IProject earProject, IProgressMonitor monitor, String JAXRSLibraryID);
- /**
- * @param project to uninstall shared libraries from
- */
- protected abstract void unInstallSharedLibs(IProject webProject);
- /**
- * @param project to check if shared libraries are supported
- * @param JAXRSLibraryID the ID of the JAX-RS implementation library being used
- * @return true if shared library support is available
- */
- protected abstract boolean sharedLibSupported(IProject webProject, IProject earProject, boolean addToEAR, String JAXRSLibraryID);
- /**
- * @param webProject to install shared libraries to
- * @param earProject to install shared libraries to
- * @param monitor to monitor progress
- * @param JAXRSLibraryID the ID of the library being used by the project (
- */
- protected abstract void installSharedLibs(IProject webProject, IProject earProject, IProgressMonitor monitor, List<String> libraryNames);
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrssharedlibraryconfig/SharedLibraryConfigurator.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrssharedlibraryconfig/SharedLibraryConfigurator.java
deleted file mode 100644
index 09c445f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrssharedlibraryconfig/SharedLibraryConfigurator.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100303 291954 kchong@ca.ibm.com - Keith Chong, JAX-RS: Implement JAX-RS Facet
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.jaxrssharedlibraryconfig;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-public interface SharedLibraryConfigurator {
- String getName();
- void setName(String value);
- void installSharedLibs(IProject webProject, IProject earProject, IProgressMonitor monitor, List<String> libraryNames) throws CoreException;
- void installSharedLibs(IProject webProject, IProject earProject, IProgressMonitor monitor, String JAXRSLibraryID) throws CoreException;
- void unInstallSharedLibs(IProject webProject);
- boolean getIsSharedLibSupported(IProject webProject, IProject earProject, boolean addToEAR, String JAXRSLibraryID);
- void setRuntimeID(String value);
- String getRuntimeID();
- boolean getSelected();
- void setSelected(boolean value);
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrssharedlibraryconfig/SharedLibraryConfiguratorCreationHelper.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrssharedlibraryconfig/SharedLibraryConfiguratorCreationHelper.java
deleted file mode 100644
index 253e5b6..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrssharedlibraryconfig/SharedLibraryConfiguratorCreationHelper.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100407 308401 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS facet wizard page - Shared-library option should be disabled
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.jaxrssharedlibraryconfig;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jst.ws.jaxrs.core.internal.JAXRSCorePlugin;
-import org.eclipse.jst.ws.jaxrs.core.internal.Messages;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Helper class used to create JAXRS Shared Library Configurators from the
- * <code>org.eclipse.jst.ws.jaxrs.core.jaxrsSharedLibrarySupport</code>
- * extension-point. <br>
- *
- */
-public final class SharedLibraryConfiguratorCreationHelper {
- private SharedLibraryConfiguratorImpl newSharedLibConfigurator;
- private IConfigurationElement config_element;
- /**
- * Key of the 'name' attribute of the extension point.
- */
- public final static String NAME = "name"; //$NON-NLS-1$
-
-
- /**
- * Key of the 'runtimeID' attribute of the extension point.
- */
- public final static String SERVERRUNTIME = "runtimeID"; //$NON-NLS-1$
- /**
- * Key of the 'jaxrsSharedLibraryConfiguratorDelegate' attribute of the extension point.
- */
- public final static String DELEGATE = "jaxrsSharedLibraryConfiguratorDelegate"; //$NON-NLS-1$
- /**
- * Key of the 'isSelected' attribute of the extension point.
- */
- public final static String SELECTED = "isSelected"; //$NON-NLS-1$
-
- /**
- * Creates an instance with the specified IConfigurationElement instance.
- *
- * @param SharedLibraryConfigurator
- * IConfigurationElement instance
- */
- public SharedLibraryConfiguratorCreationHelper(
- IConfigurationElement SharedLibraryConfigurator) {
- this.config_element = SharedLibraryConfigurator;
- }
-
-
- /**
- * Creates a new SharedLibraryConfigurator from the JAXRSSharedLibrarySupport extension
- * point.
- *
- * @return SharedLibraryConfigurator instance.
- */
- public SharedLibraryConfigurator create() {
- try {
- newSharedLibConfigurator = new SharedLibraryConfiguratorImpl(config_element);
- newSharedLibConfigurator.setName(config_element.getAttribute(NAME));
- newSharedLibConfigurator.setRuntimeID(config_element.getAttribute(SERVERRUNTIME));
- newSharedLibConfigurator.setSelected(Boolean.parseBoolean(config_element
- .getAttribute(SELECTED)));
- return newSharedLibConfigurator;
- } catch (Exception e) {
- JAXRSCorePlugin
- .log(
- e,
- NLS
- .bind(
- Messages.PluginProvidedSharedLibraryConfiguratorCreationHelper_ErrorCreating,
- newSharedLibConfigurator.getName()));
- }
- return null;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrssharedlibraryconfig/SharedLibraryConfiguratorImpl.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrssharedlibraryconfig/SharedLibraryConfiguratorImpl.java
deleted file mode 100644
index b820ef1..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrssharedlibraryconfig/SharedLibraryConfiguratorImpl.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100303 291954 kchong@ca.ibm.com - Keith Chong, JAX-RS: Implement JAX-RS Facet
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.jaxrssharedlibraryconfig;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-public class SharedLibraryConfiguratorImpl implements SharedLibraryConfigurator {
- private IConfigurationElement config_element;
- /**
- * Key of the 'jaxrsSharedLibraryConfiguratorDelegate' attribute of the extension point.
- */
- public final static String DELEGATE = "jaxrsSharedLibraryConfiguratorDelegate"; //$NON-NLS-1$
- boolean selected = false;
- String name;
- String runtimeID;
- public SharedLibraryConfiguratorImpl(IConfigurationElement config_element) {
- this.config_element = config_element;
- }
- public boolean getIsSharedLibSupported(IProject webProject, IProject earProject, boolean addToEAR, String JAXRSLibraryID) {
- JAXRSSharedLibConfiguratorDelegate sharedLibConfigurator = null;
-
- try {
- sharedLibConfigurator = (JAXRSSharedLibConfiguratorDelegate) config_element
- .createExecutableExtension(DELEGATE);
- } catch (CoreException e) {
- //not much we want to do here, just return not suported
- }
- if (sharedLibConfigurator != null) {
- return sharedLibConfigurator.sharedLibSupported(webProject, earProject, addToEAR, JAXRSLibraryID);
- }
- return false;
- }
-
- public String getName() {
- return name;
- }
-
- public String getRuntimeID() {
- return runtimeID;
- }
-
- public void installSharedLibs(IProject webProject, IProject earProject, IProgressMonitor monitor, String JAXRSLibraryID) throws CoreException {
- JAXRSSharedLibConfiguratorDelegate sharedLibConfigurator = null;
-
- sharedLibConfigurator = (JAXRSSharedLibConfiguratorDelegate) config_element
- .createExecutableExtension(DELEGATE);
- if (sharedLibConfigurator != null) {
- sharedLibConfigurator.installSharedLibs(webProject, earProject, monitor, JAXRSLibraryID);
- }
- }
-
-
- public void setName(String value) {
- this.name = value;
-
- }
-
- public void unInstallSharedLibs(IProject webProject) {
- JAXRSSharedLibConfiguratorDelegate sharedLibConfigurator = null;
-
- try {
- sharedLibConfigurator = (JAXRSSharedLibConfiguratorDelegate) config_element
- .createExecutableExtension(DELEGATE);
- } catch (CoreException e) {
- //not much we want to do, libraries not uninstalled
- }
- if (sharedLibConfigurator != null) {
- sharedLibConfigurator.unInstallSharedLibs(webProject);
- }
- }
-
- public void setRuntimeID(String value) {
- this.runtimeID = value;
-
- }
-
- public boolean getSelected() {
- return this.selected;
- }
-
- public void setSelected(boolean value) {
- this.selected = value;
-
- }
-
- public void installSharedLibs(IProject webProject, IProject earProject,
- IProgressMonitor monitor, List<String> libraryNames)
- throws CoreException {
- JAXRSSharedLibConfiguratorDelegate sharedLibConfigurator = null;
-
- sharedLibConfigurator = (JAXRSSharedLibConfiguratorDelegate) config_element
- .createExecutableExtension(DELEGATE);
- if (sharedLibConfigurator != null) {
- sharedLibConfigurator.installSharedLibs(webProject, earProject, monitor, libraryNames);
- }
-
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrssharedlibraryconfig/SharedLibraryConfiguratorUtil.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrssharedlibraryconfig/SharedLibraryConfiguratorUtil.java
deleted file mode 100644
index 095345d..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrssharedlibraryconfig/SharedLibraryConfiguratorUtil.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100407 308401 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS facet wizard page - Shared-library option should be disabled
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.jaxrssharedlibraryconfig;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.InvalidRegistryObjectException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.ws.jaxrs.core.internal.JAXRSCorePlugin;
-import org.eclipse.jst.ws.jaxrs.core.internal.Messages;
-import org.eclipse.jst.ws.jaxrs.core.internal.project.facet.IJAXRSFacetInstallDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * A singleton maintains lists of Shared library configurators
- *
- */
-public class SharedLibraryConfiguratorUtil {
- private static SharedLibraryConfiguratorUtil instance = null;
-
- private static List<SharedLibraryConfigurator> configurators = new Vector<SharedLibraryConfigurator>();
-
- private static final String SHAREDLIB_EXT_PT = "jaxrsSharedLibrarySupport"; //$NON-NLS-1$
-
-
- /**
- * Private constructor
- */
- private SharedLibraryConfiguratorUtil() {
- // nothing to do
- }
-
- public static boolean isSharedLibSelectedByDefault(String targetRuntimeID) {
- if (targetRuntimeID == null)
- return false;
-
- SharedLibraryConfiguratorUtil.getInstance();
- java.util.List<SharedLibraryConfigurator> configurators = getConfigurators();
-
- Iterator<SharedLibraryConfigurator> sharedLibConfiguratorIterator = configurators
- .iterator();
- while (sharedLibConfiguratorIterator.hasNext()) {
- SharedLibraryConfigurator thisConfigurator = sharedLibConfiguratorIterator
- .next();
- if (targetRuntimeID.equals(thisConfigurator.getRuntimeID())) {
- return thisConfigurator.getSelected();
- }
-
- }
-
- return false;
- }
-
- public static boolean isSharedLibSupportAvailable(String libraryID,
- String targetRuntimeID, IProject webProject, IProject earProject,
- boolean addToEAR) {
- if (libraryID == null || targetRuntimeID == null
- || libraryID.length() == 0 || libraryID.length() == 0)
- return false;
-
- SharedLibraryConfiguratorUtil.getInstance();
- java.util.List<SharedLibraryConfigurator> configurators = getConfigurators();
-
- Iterator<SharedLibraryConfigurator> sharedLibConfiguratorIterator = configurators
- .iterator();
- while (sharedLibConfiguratorIterator.hasNext()) {
- SharedLibraryConfigurator thisConfigurator = sharedLibConfiguratorIterator
- .next();
- if (targetRuntimeID.equals(thisConfigurator.getRuntimeID())) {
- if (thisConfigurator.getIsSharedLibSupported(webProject,
- earProject, addToEAR, libraryID)) {
- return true;
- }
- }
-
- }
-
- return false;
- }
-
- /**
- * Return the singleton instance of SharedLibraryConfiguratorUtil.
- *
- * @return SharedLibraryConfiguratorUtil
- */
- public synchronized static SharedLibraryConfiguratorUtil getInstance() {
- if (instance == null) {
- instance = new SharedLibraryConfiguratorUtil();
- instance.loadSharedLibraryConfiguratorExtensions();
- }
- return instance;
- }
-
- /**
- * Creates jax-rs shared library configurator items from extension points.
- */
- private void loadSharedLibraryConfiguratorExtensions() {
- try {
- IExtensionPoint point = Platform.getExtensionRegistry()
- .getExtensionPoint(JAXRSCorePlugin.PLUGIN_ID, SHAREDLIB_EXT_PT);
- IExtension[] extensions = point.getExtensions();
- for (int i = 0; i < extensions.length; i++) {
- IExtension ext = extensions[i];
- for (int j = 0; j < ext.getConfigurationElements().length; j++) {
- SharedLibraryConfiguratorCreationHelper newLibCreator = new SharedLibraryConfiguratorCreationHelper(
- ext.getConfigurationElements()[j]);
- SharedLibraryConfigurator newconfigurator = newLibCreator.create();
-
- if (newconfigurator != null)
- configurators.add(newconfigurator);
- }
- }
- } catch (InvalidRegistryObjectException e) {
- JAXRSCorePlugin.log(IStatus.ERROR,
- Messages.JAXRSSharedLibraryConfigurator_ErrorLoadingFromExtPt, e);
- }
- }
-
- public static boolean getAddToEar(IDataModel model) {
- return model.getBooleanProperty(IJAXRSFacetInstallDataModelProperties.ADD_TO_EAR);
- }
- public static IProject getEARProject(IDataModel model) {
- String projName = model.getStringProperty(IJAXRSFacetInstallDataModelProperties.EARPROJECT_NAME);
- if (projName == null || "".equals(projName))
- return null;
-
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(
- projName);
- return project;
- }
- public static IProject getWebProject(IDataModel model) {
- String projName = model.getStringProperty(IJAXRSFacetInstallDataModelProperties.WEBPROJECT_NAME);
- if (projName == null || "".equals(projName))
- return null;
-
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(
- projName);
- return project;
- }
- public static List<SharedLibraryConfigurator> getConfigurators() {
- return configurators;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/messages.properties b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/messages.properties
deleted file mode 100644
index 43b38ab..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/messages.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-###############################################################################
-# Copyright (c) 2009, 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-# yyyymmdd bug Email and other contact information
-# -------- -------- -----------------------------------------------------------
-# 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
-# 20100413 307552 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS and Java EE 6 setup is incorrect
-# 20100519 313576 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS tools- validation problems
-###############################################################################
-JAXRSLibraryRegistry_ErrorCreatingURL=Error creating URL for JAX-RS Library Registry
-JAXRSLibraryRegistry_ErrorSaving=Error saving JAX-RS Library Registry
-JAXRSLibraryRegistry_DEFAULT_IMPL_LABEL=<Default>
-JAXRSLibraryConfigModel_Null_Data_Source=Data Source is not provided.
-JAXRSLibraryRegistry_ErrorLoadingFromExtPt=Error while loading JAX-RS Libraries from extension points
-JAXRSSharedLibraryConfigurator_ErrorLoadingFromExtPt=Error while loading JAX-RS Shared Library Configurators from extension points
-JAXRSLibraryProvider_ErrorLoadingFromExtPt=Error while loading JAX-RS Library Providers from extension points
-JAXRSLibraryClasspathContainer_IMPL_LIBRARY=[JAX-RS Library]
-
-JAXRSFacetInstallDataModelProvider_ValidateServletName=Specify a servlet name to use
-JAXRSFacetInstallDataModelProvider_ValidateServletClassName=Specify a servlet class name to use
-JAXRSLibraryConfigPersistData_SAVED_IMPLLIB_NOT_FOUND=Saved JAX-RS implementation library in {0} is unavailable in JAX-RS Library Registry
-JAXRSLibraryConfigPersistData_SAVED_COMPLIB_NOT_FOUND=Saved JAX-RS component library in {0} is unavailable in JAX-RS Library Registry
-JAXRSLibrariesContainerInitializer_missing_library=[missing JAX-RS Library]
-JAXRSFacetInstallDataModelProvider_ValidateJAXRSImpl=A JAX-RS implementation library has not been chosen
-JAXRSFacetInstallDataModelProvider_DupeJarValidation=Duplicated jar on classpath: {0}
-JAXRSFacetInstallDataModelProvider_ClientImplValidationMsg=JAX-RS Implementation library must be specified.
-
-JAXRSFacetInstallDelegate_InternalErr=Internal Error creating JAX-RS Facet. Missing configuration.
-JAXRSFacetInstallDelegate_ConfigErr=''{0}'' : unable to configure web module for JAX-RS
-JAXRSFacetInstallDelegate_NonUpdateableWebXML=JAX-RS Facet was not installed on ''{0}''. The web.xml file needs to be updateable.
-JAXRSFacetUninstallDelegate_ConfigErr=''{0}'' : unable to de-configure web module for JAX-RS
-JAXRSFacetUninstallDelegate_NonUpdateableWebXML=JAX-RS Facet was not un-installed from ''{0}''. The web.xml file needs to be updateable.
-
-ArchiveFileImpl_CannotCopyFile=Cannot copy file
-ArchiveFileImpl_CannotCloseFile=Cannot close file
-ArchiveFileImpl_CannotLocatePluginRelativeFile=Cannot locate plugin-relative file "{0}"
-
-PluginProvidedJAXRSLibraryCreationHelper_ErrorCreating=Unable to create JAX-RS Library: {0}
-PluginProvidedSharedLibraryConfiguratorCreationHelper_ErrorCreating=Unable to create JAX-RS Shared Library Configurator: {0}
-JAXRSLibraryProviderCreationHelper_ErrorCreating=Unable to create JAX-RS Library Provider: {0}
-PluginProvidedJAXRSLibraryCreationHelper_ErrorMultipleDefinition={0} defined multiple times in {1}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/IJAXRSFacetInstallDataModelProperties.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/IJAXRSFacetInstallDataModelProperties.java
deleted file mode 100644
index ac572ce..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/IJAXRSFacetInstallDataModelProperties.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20091106 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100303 291954 kchong@ca.ibm.com - Keith Chong, JAX-RS: Implement JAX-RS Facet
- * 20100413 307552 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS and Java EE 6 setup is incorrect
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.project.facet;
-
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetInstallDataModelProperties;
-
-/**
- * Defines properties used by the JAXRS facet install data model.
- *
- */
-public interface IJAXRSFacetInstallDataModelProperties extends
- IFacetInstallDataModelProperties {
-
- public static final String ADD_TO_EAR = "IJAXRSFacetInstallDataModelProperties.ADD_TO_EAR"; //$NON-NLS-1$
-
- public static final String SHAREDLIBRARY = "IJAXRSFacetInstallDataModelProperties.SHAREDLIBRARY"; //$NON-NLS-1$
-
- public static final String EARPROJECT_NAME = "IJAXRSFacetInstallDataModelProperties.EARPROJECT_NAME"; //$NON-NLS-1$
-
- public static final String WEBPROJECT_NAME = "IJAXRSFacetInstallDataModelProperties.WEBPROJECT_NAME"; //$NON-NLS-1$
-
- public static final String TARGETRUNTIME = "IJAXRSFacetInstallDataModelProperties.TARGETRUNTIME"; //$NON-NLS-1$
-
- public static final String SERVLET_NAME = "IJAXRSFacetInstallDataModelProperties.SERVLET_NAME"; //$NON-NLS-1$
-
- public static final String SERVLET_CLASSNAME = "IJAXRSFacetInstallDataModelProperties.SERVLET_CLASSNAME"; //$NON-NLS-1$
-
- public static final String SERVLET_URL_PATTERNS = "IJAXRSFacetInstallDataModelProperties.SERVLET_URL_PATTERNS"; //$NON-NLS-1$
-
- public static final String WEBCONTENT_DIR = "IJAXRSFacetInstallDataModelProperties.WEBCONTENT_DIR"; //$NON-NLS-1$
-
- public static final String LIBRARY_PROVIDER_DELEGATE = "IJAXRSFacetInstallDataModelProperties.LIBRARY_PROVIDER_DELEGATE"; //$NON-NLS-1$
-
- public static final String DEPLOY_IMPLEMENTATION = "IJAXRSFacetInstallDataModelProperties.DEPLOY_IMPLEMENTATION"; //$NON-NLS-1$
-
- public static final String CONFIGURATION_PRESET = "IJAXRSFacetInstallDataModelProperties.CONFIGURATION_PRESET"; //$NON-NLS-1$"
-
- public static final String SERVER_IRUNTIME = "IJAXRSFacetInstallDataModelProperties.SERVER_IRUNTIME"; //$NON-NLS-1$"
-
- // Support post-project creation scenario. If WAR is parked in multiple EARs, then we should update all the EARs
- public static final String EARPROJECTS = "IJAXRSFacetInstallDataModelProperties.EARPROJECTS"; //$NON-NLS-1$
-
- public static final String UPDATEDD = "IJAXRSFacetInstallDataModelProperties.UPDATEDD"; //$NON-NLS-1$
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/IJAXRSSharedLibraryProviderInstallOperationConfig.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/IJAXRSSharedLibraryProviderInstallOperationConfig.java
deleted file mode 100644
index 8a3f797..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/IJAXRSSharedLibraryProviderInstallOperationConfig.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20100310 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.project.facet;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-public interface IJAXRSSharedLibraryProviderInstallOperationConfig {
-
- public void setSharedLibrary(boolean isSharedLibrary);
-
- public boolean isSharedLibrary();
-
- public void setIsDeploy(boolean isDeploy);
-
- public boolean isDeploy();
-
- public void setModel(IDataModel model);
-
- public IDataModel getModel();
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSFacetDefaultVersionProvider.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSFacetDefaultVersionProvider.java
deleted file mode 100644
index 1976bc6..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSFacetDefaultVersionProvider.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091106 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100302 304405 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS Facet : support JAX-RS 1.1 (JSR 311)
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.project.facet;
-
-
-import org.eclipse.jst.ws.jaxrs.core.internal.IJAXRSCoreConstants;
-import org.eclipse.wst.common.project.facet.core.IDefaultVersionProvider;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-/**
- * Provides the default JAX-RS project facet version.
- * Currently always returns "1.1" facet version. Eventually should be computed from the project's facet context.
- *
- */
-public final class JAXRSFacetDefaultVersionProvider implements IDefaultVersionProvider {
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.project.facet.core.IDefaultVersionProvider#getDefaultVersion()
- */
- public IProjectFacetVersion getDefaultVersion() {
- return ProjectFacetsManager.getProjectFacet(IJAXRSCoreConstants.JAXRS_FACET_ID).getVersion(IJAXRSCoreConstants.FACET_VERSION_1_1);
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSFacetException.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSFacetException.java
deleted file mode 100644
index 9dc7bc7..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSFacetException.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.project.facet;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.jaxrs.core.internal.JAXRSCorePlugin;
-
-/**
- * Exception for use during JAXRS Facet installation/un-installation
- *
- */
-public class JAXRSFacetException extends CoreException {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * Constructor
- *
- * @param msg
- */
- public JAXRSFacetException(String msg) {
- super(new Status(IStatus.ERROR, JAXRSCorePlugin.PLUGIN_ID, msg));
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSFacetInstallDataModelProvider.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSFacetInstallDataModelProvider.java
deleted file mode 100644
index 4edd190..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSFacetInstallDataModelProvider.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20091106 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100303 291954 kchong@ca.ibm.com - Keith Chong, JAX-RS: Implement JAX-RS Facet
- * 20100407 308401 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS facet wizard page - Shared-library option should be disabled
- * 20100413 307552 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS and Java EE 6 setup is incorrect
- * 20100519 313576 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS tools- validation problems
- * 20110817 352887 kchong@ca.ibm.com - Keith Chong, [JAXRS] JAXRSFacetInstallDataModelProvider dispose method does not remove all listeners it adds
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.project.facet;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.common.project.facet.core.libprov.IPropertyChangeListener;
-import org.eclipse.jst.common.project.facet.core.libprov.LibraryInstallDelegate;
-import org.eclipse.jst.ws.jaxrs.core.internal.IJAXRSCoreConstants;
-import org.eclipse.jst.ws.jaxrs.core.internal.JAXRSCorePlugin;
-import org.eclipse.jst.ws.jaxrs.core.internal.Messages;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.ArchiveFile;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibrary;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryconfig.JAXRSLibraryInternalReference;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryconfig.JAXRSLibraryRegistryUtil;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.componentcore.datamodel.FacetInstallDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectWorkingCopy;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-/**
- * Provides a data model used by the JAXRS facet install.
- */
-public class JAXRSFacetInstallDataModelProvider extends
- FacetInstallDataModelProvider implements
- IJAXRSFacetInstallDataModelProperties {
-
- private String errorMessage;
- private LibraryInstallDelegate libraryInstallDelegate = null;
- private IPropertyChangeListener propertyChangeListener = null;
-
- @SuppressWarnings("unchecked")
- public Set<String> getPropertyNames() {
- Set<String> names = super.getPropertyNames();
- names.add(SHAREDLIBRARY);
- names.add(EARPROJECT_NAME);
- names.add(WEBPROJECT_NAME);
- names.add(ADD_TO_EAR);
- names.add(TARGETRUNTIME);
- names.add(SERVLET_NAME);
- names.add(SERVLET_CLASSNAME);
- names.add(SERVLET_URL_PATTERNS);
- names.add(WEBCONTENT_DIR);
- names.add(LIBRARY_PROVIDER_DELEGATE);
- names.add(DEPLOY_IMPLEMENTATION);
- names.add(CONFIGURATION_PRESET);
- names.add(SERVER_IRUNTIME);
- names.add(EARPROJECTS);
- names.add(UPDATEDD);
-
- return names;
- }
-
- public Object getDefaultProperty(String propertyName) {
-
- if (propertyName.equals(EARPROJECT_NAME)) {
- return null;
- } else if (propertyName.equals(WEBPROJECT_NAME)) {
- return null;
- } else if (propertyName.equals(ADD_TO_EAR)) {
- return Boolean.FALSE;
- } else if (propertyName.equals(TARGETRUNTIME)) {
- return null;
- } else if (propertyName.equals(SERVLET_NAME)) {
- return JAXRSUtils.JAXRS_DEFAULT_SERVLET_NAME;
- } else if (propertyName.equals(SERVLET_CLASSNAME)) {
- return JAXRSUtils.JAXRS_SERVLET_CLASS;
- } else if (propertyName.equals(SERVLET_URL_PATTERNS)) {
- return new String[] { JAXRSUtils.JAXRS_DEFAULT_URL_MAPPING };
- } else if (propertyName.equals(FACET_ID)) {
- return IJAXRSCoreConstants.JAXRS_FACET_ID;
- } else if (propertyName.equals(WEBCONTENT_DIR)) {
- return "WebContent"; //$NON-NLS-1$
- } else if (propertyName.equals(LIBRARY_PROVIDER_DELEGATE)) {
- return this.libraryInstallDelegate;
- } else if (propertyName.equals(DEPLOY_IMPLEMENTATION)) {
- return Boolean.TRUE;
- } else if (propertyName.equals(CONFIGURATION_PRESET)) {
- return null;
- } else if (propertyName.equals(SERVER_IRUNTIME)) {
- return null;
- } else if (propertyName.equals(EARPROJECTS)) {
- return null;
- } else if (propertyName.equals(SHAREDLIBRARY)) {
- return false;
- } else if (propertyName.equals(DEPLOY_IMPLEMENTATION)) {
- return true;
- } else if (propertyName.equals(UPDATEDD)) {
- return true;
- }
- return super.getDefaultProperty(propertyName);
- }
-
- public IStatus validate(String name) {
- errorMessage = null;
- if (name.equals(LIBRARY_PROVIDER_DELEGATE)) {
- return ((LibraryInstallDelegate) getProperty(LIBRARY_PROVIDER_DELEGATE))
- .validate();
- } else if (name.equals(SERVLET_NAME) || name.equals(SERVLET_CLASSNAME) || name.equals(UPDATEDD)) {
- if (this.getBooleanProperty(IJAXRSFacetInstallDataModelProperties.UPDATEDD))
- return validateServletInfo(getStringProperty(SERVLET_NAME), getStringProperty(SERVLET_CLASSNAME));
- else
- return super.validate(name);
- }
- return super.validate(name);
- }
-
- public boolean propertySet(final String propertyName,
- final Object propertyValue) {
- if (propertyName.equals(FACETED_PROJECT_WORKING_COPY)
- || propertyName.equals(FACET_VERSION)) {
- initLibraryInstallDelegate();
-
- if (this.libraryInstallDelegate != null
- && propertyName.equals(FACET_VERSION)) {
- final IProjectFacetVersion fv = (IProjectFacetVersion) getProperty(FACET_VERSION);
- this.libraryInstallDelegate.setProjectFacetVersion(fv);
- }
- }
-
- return super.propertySet(propertyName, propertyValue);
- }
- @SuppressWarnings("restriction")
- private void initLibraryInstallDelegate()
- {
- final IFacetedProjectWorkingCopy fpjwc = (IFacetedProjectWorkingCopy) getProperty( FACETED_PROJECT_WORKING_COPY );
- final IProjectFacetVersion fv = (IProjectFacetVersion) getProperty( FACET_VERSION );
-
- if( this.libraryInstallDelegate == null && fpjwc != null && fv != null )
- {
- this.libraryInstallDelegate = new LibraryInstallDelegate( fpjwc, fv );
- this.propertyChangeListener = new IPropertyChangeListener()
- {
- public void propertyChanged( final String property,
- final Object oldValue,
- final Object newValue )
- {
- final IDataModel dm = getDataModel();
-
- if( dm != null )
- {
- dm.notifyPropertyChange( LIBRARY_PROVIDER_DELEGATE, IDataModel.VALUE_CHG );
- }
- }
- };
- this.libraryInstallDelegate.addListener(propertyChangeListener);
- }
- }
-
- @SuppressWarnings("restriction")
- public void dispose()
- {
- if (this.libraryInstallDelegate != null)
- {
- this.libraryInstallDelegate.removeListener(propertyChangeListener);
- }
- super.dispose(); // empty
- }
-
- private IStatus createErrorStatus(String msg) {
- return new Status(IStatus.ERROR, JAXRSCorePlugin.PLUGIN_ID, msg);
- }
-
- private IStatus validateServletInfo(String servletName, String servletClassName) {
- if (servletName == null || servletName.trim().length() == 0) {
- errorMessage = Messages.JAXRSFacetInstallDataModelProvider_ValidateServletName;
- return createErrorStatus(errorMessage);
- }
- if (servletClassName == null || servletClassName.trim().length() == 0) {
- errorMessage = Messages.JAXRSFacetInstallDataModelProvider_ValidateServletClassName;
- return createErrorStatus(errorMessage);
- }
-
- return OK_STATUS;
- }
-
- private IProject getProject() {
- String projName = (String) getProperty(FACET_PROJECT_NAME);
- if (projName == null || "".equals(projName))
- return null;
-
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(
- projName);
- return project;
- }
-
- private boolean doesProjectExist() {
- IProject project = getProject();
- return (project != null) && project.exists();
- }
-
- @SuppressWarnings("unchecked")
- private IStatus checkForDupeArchiveFiles(Set<String> jars,
- JAXRSLibrary aJAXRSLib) {
- if (aJAXRSLib == null)
- return OK_STATUS;
-
- for (Iterator it = aJAXRSLib.getArchiveFiles().iterator(); it.hasNext();) {
- ArchiveFile jar = (ArchiveFile) it.next();
- if (jars.contains(jar.getResolvedSourceLocation())) {
- return createErrorStatus(NLS
- .bind(
- Messages.JAXRSFacetInstallDataModelProvider_DupeJarValidation,
- jar.getResolvedSourceLocation()));
- }
- jars.add(jar.getResolvedSourceLocation());
- }
- return OK_STATUS;
- }
-
- private List<JAXRSLibraryInternalReference> getDefaultJAXRSImplementationLibraries() {
- List<JAXRSLibraryInternalReference> list = new ArrayList<JAXRSLibraryInternalReference>();
- if (JAXRSLibraryRegistryUtil.getInstance().getJAXRSLibraryRegistry() != null) {
- JAXRSLibrary jaxrsLib = JAXRSLibraryRegistryUtil.getInstance()
- .getJAXRSLibraryRegistry().getDefaultImplementation();
- if (jaxrsLib != null) {
- JAXRSLibraryInternalReference prjJAXRSLib = new JAXRSLibraryInternalReference(
- jaxrsLib, true, true, false);
- list.add(prjJAXRSLib);
- }
- }
- return list;
- }
-
- private JAXRSLibraryInternalReference getDefaultImplementationLibrary() {
- if (JAXRSLibraryRegistryUtil.getInstance().getJAXRSLibraryRegistry() != null) {
- JAXRSLibrary jaxrsLib = JAXRSLibraryRegistryUtil.getInstance()
- .getJAXRSLibraryRegistry().getDefaultImplementation();
- return new JAXRSLibraryInternalReference(jaxrsLib, true, true, false);
- }
- return null;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSFacetInstallDelegate.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSFacetInstallDelegate.java
deleted file mode 100644
index 132f95c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSFacetInstallDelegate.java
+++ /dev/null
@@ -1,356 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20091106 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100303 291954 kchong@ca.ibm.com - Keith Chong, JAX-RS: Implement JAX-RS Facet
- * 20100310 304405 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS Facet : support JAX-RS 1.1
- * 20100319 306595 ericdp@ca.ibm.com - Eric D. Peters, several install scenarios fail for both user library & non-user library
- * 20100413 307552 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS and Java EE 6 setup is incorrect
- * 20100428 310905 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS facet fails to install due to NPE or runtime exception due to duplicate cp entries
- * 20101123 330916 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS - facet install should consider Web project associated with multiple EARs
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.project.facet;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathAttribute;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.common.project.facet.core.libprov.ILibraryProvider;
-import org.eclipse.jst.common.project.facet.core.libprov.LibraryInstallDelegate;
-import org.eclipse.jst.j2ee.classpathdep.ClasspathDependencyUtil;
-import org.eclipse.jst.j2ee.classpathdep.IClasspathDependencyConstants;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.ws.jaxrs.core.internal.IJAXRSCoreConstants;
-import org.eclipse.jst.ws.jaxrs.core.internal.Messages;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryconfig.JAXRSLibraryInternalReference;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrssharedlibraryconfig.SharedLibraryConfigurator;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrssharedlibraryconfig.SharedLibraryConfiguratorUtil;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-/**
- * JAXRS Facet Install Delegate for WTP faceted web projects. Deals with 2.3,
- * 2.4 and 2.5 web app models.
- *
- * Uses
- * <code>com.eclispe.jst.ws.jaxrs.core.internal.project.facet.JAXRSFacetInstallDataModelProvider<code> for model
- * <li> updates web.xml for: servlet, servlet-mapping and context-param
- * <li> adds implementation jars to WEB-INF/lib if user requests
- *
- * @see org.eclipse.jst.ws.jaxrs.core.internal.project.facet.JAXRSFacetInstallDataModelProvider
- * @since 1.0
- */
-public final class JAXRSFacetInstallDelegate implements IDelegate {
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.wst.common.project.facet.core.IDelegate#execute(org.eclipse
- * .core.resources.IProject,
- * org.eclipse.wst.common.project.facet.core.IProjectFacetVersion,
- * java.lang.Object, org.eclipse.core.runtime.IProgressMonitor)
- */
- public void execute(final IProject project, final IProjectFacetVersion fv,
- final Object cfg, final IProgressMonitor monitor)
- throws CoreException
-
- {
-
- if (monitor != null) {
- monitor.beginTask("", 1); //$NON-NLS-1$
- }
-
- try {
- IDataModel config = null;
-
- if (cfg != null) {
- config = (IDataModel) cfg;
- } else {
- throw new JAXRSFacetException(
- Messages.JAXRSFacetInstallDelegate_InternalErr);
- }
-
- // Before we do any configuration, verify that web.xml is available
- // for update
- IModelProvider provider = JAXRSUtils.getModelProvider(project);
- if (provider == null) {
- throw new JAXRSFacetException(NLS.bind(
- Messages.JAXRSFacetInstallDelegate_ConfigErr, project
- .getName()));
- } else if (!(provider.validateEdit(null, null).isOK())) {
- // checks for web.xml file being read-only and allows user to set writeable
- if (!(provider.validateEdit(null, null).isOK())) {
- throw new JAXRSFacetException(
- NLS
- .bind(
- Messages.JAXRSFacetInstallDelegate_NonUpdateableWebXML,
- project.getName())); //$NON-NLS-2$
- }
- }
-
-
- if (((LibraryInstallDelegate) config
- .getProperty(IJAXRSFacetInstallDataModelProperties.LIBRARY_PROVIDER_DELEGATE))
- .getLibraryProviderOperationConfig() instanceof JAXRSUserLibraryProviderInstallOperationConfig
- // deploy is chosen
- || (config
- .getProperty(IJAXRSFacetInstallDataModelProperties.DEPLOY_IMPLEMENTATION) != null && Boolean
- .parseBoolean((config
- .getProperty(IJAXRSFacetInstallDataModelProperties.DEPLOY_IMPLEMENTATION)
- .toString())))
- // don't include libraries
- || (config
- .getProperty(IJAXRSFacetInstallDataModelProperties.DEPLOY_IMPLEMENTATION) != null
- && !Boolean
- .parseBoolean((config
- .getProperty(IJAXRSFacetInstallDataModelProperties.DEPLOY_IMPLEMENTATION)
- .toString())) && (config
- .getProperty(IJAXRSFacetInstallDataModelProperties.SHAREDLIBRARY) == null || (config
- .getProperty(IJAXRSFacetInstallDataModelProperties.SHAREDLIBRARY) != null && !Boolean
- .parseBoolean((config
- .getProperty(IJAXRSFacetInstallDataModelProperties.SHAREDLIBRARY)
- .toString())))))
-
- ) {
- // either deploy is chosen, or user chosen not include
- // libraries, or it is our shared library install delegate which
- // handles both deploy & shared library options
- ((LibraryInstallDelegate) config
- .getProperty(IJAXRSFacetInstallDataModelProperties.LIBRARY_PROVIDER_DELEGATE))
- .execute(new NullProgressMonitor());
- } else {
- // Create JAXRS libraries by calling Library installer then
- // appropriate SharedLibraryConfigurator
- ((LibraryInstallDelegate) config
- .getProperty(IJAXRSFacetInstallDataModelProperties.LIBRARY_PROVIDER_DELEGATE))
- .execute(new NullProgressMonitor());
- if (!disableLibraryConfigSelected((LibraryInstallDelegate) config
- .getProperty(IJAXRSFacetInstallDataModelProperties.LIBRARY_PROVIDER_DELEGATE)))
- createSharedLibraries(project, fv, monitor, config);
- }
-
- // Update web model if necessary
- if (config.getBooleanProperty(IJAXRSFacetInstallDataModelProperties.UPDATEDD))
- createServletAndModifyWebXML(project, config, monitor);
- if (monitor != null) {
- monitor.worked(1);
- }
-
- } finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
-
- private boolean disableLibraryConfigSelected(LibraryInstallDelegate property) {
- return property.getLibraryProvider().getId() != null
- && property.getLibraryProvider().getId().equals(
- IJAXRSCoreConstants.NO_OP_LIBRARY_ID) ? true : false;
- }
-
- private void createSharedLibraries(IProject project,
- IProjectFacetVersion fv, IProgressMonitor monitor, IDataModel config) throws CoreException {
-
- String targetRuntimeID = config
- .getStringProperty(IJAXRSFacetInstallDataModelProperties.TARGETRUNTIME);
- SharedLibraryConfiguratorUtil
- .getInstance();
- java.util.List<SharedLibraryConfigurator> configurators = SharedLibraryConfiguratorUtil.getConfigurators();
- ILibraryProvider libref = ((LibraryInstallDelegate)config.getProperty(IJAXRSFacetInstallDataModelProperties.LIBRARY_PROVIDER_DELEGATE)).getLibraryProvider();
- Iterator<SharedLibraryConfigurator> sharedLibConfiguratorIterator = configurators
- .iterator();
- while (sharedLibConfiguratorIterator.hasNext()) {
- SharedLibraryConfigurator thisConfigurator = sharedLibConfiguratorIterator
- .next();
- if (targetRuntimeID.equals(thisConfigurator.getRuntimeID())) {
- IProject earProject = getEARProject(config);
- Boolean addToEar = getAddToEar(config);
- List<IProject> earProjects = (List<IProject>)config.getProperty(IJAXRSFacetInstallDataModelProperties.EARPROJECTS);
- // Let's check the EARPROJECTS property first. If it's not null, then we are in the post-project creation mode
- // and more than one EAR is referenced.
- if (earProjects != null) {
- // Iterate over all the referenced EAR projects and update them with shared library support
- for (IProject ear : earProjects)
- {
- if (thisConfigurator.getIsSharedLibSupported(project,
- ear, addToEar, libref.getId())) {
- thisConfigurator.installSharedLibs(project, ear,
- monitor, new ArrayList<String>());
- }
- }
- } else { // ....otherwise, business as usual, only one ear applies.
- if (thisConfigurator.getIsSharedLibSupported(project,
- earProject, addToEar, libref.getId())) {
- thisConfigurator.installSharedLibs(project, earProject,
- monitor, new ArrayList<String>());
- break;
- }
- }
- }
-
- }
- }
-
- /**
- * @param path
- * @param lib
- * @return creates new IClasspathEntry with WTP dependency attribute set, if
- * required
- */
- private IClasspathEntry getNewCPEntry(final IPath path,
- final JAXRSLibraryInternalReference lib) {
-
- IClasspathEntry entry = null;
- if (lib.isCheckedToBeDeployed()) {
- IClasspathAttribute depAttrib = JavaCore
- .newClasspathAttribute(
- IClasspathDependencyConstants.CLASSPATH_COMPONENT_DEPENDENCY,
- ClasspathDependencyUtil.getDefaultRuntimePath(true)
- .toString());
- entry = JavaCore.newContainerEntry(path, null,
- new IClasspathAttribute[] { depAttrib }, true);
- } else {
- entry = JavaCore.newContainerEntry(path);
- }
-
- return entry;
- }
-
-// /**
-// * @param config
-// * @return list of URL patterns from the datamodel
-// */
-// private List<String> getServletMappings(final IDataModel config) {
-// List<String> mappings = new ArrayList<String>();
-// String[] patterns = (String[]) config
-// .getProperty(IJAXRSFacetInstallDataModelProperties.SERVLET_URL_PATTERNS);
-// for (int i = 0; i < patterns.length; i++) {
-// String pattern = patterns[i];
-// mappings.add(pattern);
-// }
-//
-// return mappings;
-// }
-
- /**
- * Create servlet and URL mappings and update the webapp
- *
- * @param project
- * @param config
- * @param monitor
- */
- private void createServletAndModifyWebXML(final IProject project,
- final IDataModel config, final IProgressMonitor monitor) {
-
- IModelProvider provider = JAXRSUtils.getModelProvider(project);
- IPath webXMLPath = new Path("WEB-INF").append("web.xml"); //$NON-NLS-1$ //$NON-NLS-2$
- if (JAXRSJEEUtils.isWebApp25or30(provider.getModelObject())) {
- provider.modify(new UpdateWebXMLForJavaEE(project, config),
- doesDDFileExist(project, webXMLPath) ? webXMLPath
- : IModelProvider.FORCESAVE);
- } else {// must be 2.3 or 2.4
- provider.modify(new UpdateWebXMLForJ2EE(project, config),
- webXMLPath);
- }
-
- }
-
- private boolean doesDDFileExist(IProject project, IPath webXMLPath) {
- return project.getProjectRelativePath().append(webXMLPath).toFile()
- .exists();
- }
-
- private IProject getEARProject(IDataModel config) {
- String projName = config.getStringProperty(IJAXRSFacetInstallDataModelProperties.EARPROJECT_NAME);
- if (projName == null || "".equals(projName))
- return null;
-
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(
- projName);
- return project;
- }
-
- private boolean getAddToEar(IDataModel config) {
- return config.getBooleanProperty(IJAXRSFacetInstallDataModelProperties.ADD_TO_EAR);
- }
-
-// private class UpdateWebXMLForJavaEE implements Runnable {
-// private IProject project;
-// private IDataModel config;
-//
-// UpdateWebXMLForJavaEE(final IProject project, final IDataModel config) {
-// this.project = project;
-// this.config = config;
-// }
-//
-// public void run() {
-// WebApp webApp = (WebApp) ModelProviderManager.getModelProvider(
-// project).getModelObject();
-// // create or update servlet ref
-// Servlet servlet = JAXRSJEEUtils.findJAXRSServlet(webApp);// check to
-// // see
-// // if already
-//
-// servlet = JAXRSJEEUtils.createOrUpdateServletRef(webApp, config,
-// servlet);
-//
-// // init mappings
-// List<String> listOfMappings = getServletMappings(config);
-// JAXRSJEEUtils.setUpURLMappings(webApp, listOfMappings, servlet);
-//
-// }
-// }
-//
-// private class UpdateWebXMLForJ2EE implements Runnable {
-// private IProject project;
-// private IDataModel config;
-//
-// UpdateWebXMLForJ2EE(IProject project, final IDataModel config) {
-// this.project = project;
-// this.config = config;
-// }
-//
-// public void run() {
-// org.eclipse.jst.j2ee.webapplication.WebApp webApp = (org.eclipse.jst.j2ee.webapplication.WebApp) ModelProviderManager
-// .getModelProvider(project).getModelObject();
-// // create or update servlet ref
-// org.eclipse.jst.j2ee.webapplication.Servlet servlet = JAXRSJ2EEUtils
-// .findJAXRSServlet(webApp);// check to see
-// // if already
-// // present
-//
-// servlet = JAXRSJ2EEUtils.createOrUpdateServletRef(webApp, config,
-// servlet);
-//
-// // init mappings
-// List<String> listOfMappings = getServletMappings(config);
-// JAXRSJ2EEUtils.setUpURLMappings(webApp, listOfMappings, servlet);
-//
-// }
-//
-// }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSFacetUninstallConfig.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSFacetUninstallConfig.java
deleted file mode 100644
index 0c6649a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSFacetUninstallConfig.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091106 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.project.facet;
-
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.jst.common.project.facet.core.libprov.LibraryUninstallDelegate;
-import org.eclipse.jst.ws.jaxrs.core.internal.IJAXRSCoreConstants;
-import org.eclipse.wst.common.project.facet.core.ActionConfig;
-import org.eclipse.wst.common.project.facet.core.IActionConfigFactory;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectWorkingCopy;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-/**
- * Configuration for JAX-RS facet uninstall
- *
- */
-public class JAXRSFacetUninstallConfig
-
- extends ActionConfig
-
-{
- private LibraryUninstallDelegate librariesUninstallDelegate = null;
-
- /**
- * @return the library uninstall delegate
- */
- public LibraryUninstallDelegate getLibrariesUninstallDelegate()
- {
- return this.librariesUninstallDelegate;
- }
-
- @Override
- public void setFacetedProjectWorkingCopy( final IFacetedProjectWorkingCopy fpjwc )
- {
- super.setFacetedProjectWorkingCopy( fpjwc );
- init();
- }
-
-
- private void init()
- {
- final IFacetedProjectWorkingCopy fpjwc = getFacetedProjectWorkingCopy();
- IProjectFacetVersion fv = null;
- IFacetedProject fp = fpjwc.getFacetedProject();
- if (fp != null) {
- Set<IProjectFacetVersion> facets = fp.getProjectFacets();
- if (facets != null) {
- Iterator<IProjectFacetVersion> it = facets.iterator();
- while (it.hasNext()) {
- IProjectFacetVersion next = it.next();
- if (next.getProjectFacet().getId().equals(IJAXRSCoreConstants.JAXRS_FACET_ID)) {
- fv = next;
- break;
- }
- }
- }
-
- }
- if( this.librariesUninstallDelegate == null && fpjwc != null && fv != null)
- {
- this.librariesUninstallDelegate = new LibraryUninstallDelegate( fpjwc, fv );
- }
- }
-
- /**
- * The action configuration factory for the JAX-RS facet uninstall config
- *
- */
- public static final class Factory
-
- implements IActionConfigFactory
-
- {
- public Object create()
- {
- return new JAXRSFacetUninstallConfig();
- }
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSFacetUninstallDelegate.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSFacetUninstallDelegate.java
deleted file mode 100644
index dfa679d..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSFacetUninstallDelegate.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20091106 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100319 306594 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS facet install fails for Web 2.3 & 2.4
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.project.facet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.javaee.web.Servlet;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.ws.jaxrs.core.internal.Messages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-/**
- * JAXRS Facet Un-install Delegate for WTP faceted projects.
- *
- * <li>removes JAXRS servlet, servlet-mappings and context-params <li>leaves
- * JAXRS configuration files on disk <li>removes JAXRS classpath containers
- *
- */
-public final class JAXRSFacetUninstallDelegate implements IDelegate {
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.wst.common.project.facet.core.IDelegate#execute(org.eclipse
- * .core.resources.IProject,
- * org.eclipse.wst.common.project.facet.core.IProjectFacetVersion,
- * java.lang.Object, org.eclipse.core.runtime.IProgressMonitor)
- */
- public void execute(final IProject project, final IProjectFacetVersion fv,
- final Object config, final IProgressMonitor monitor)
- throws CoreException {
- {
-
- if (monitor != null) {
- monitor.beginTask("", 1); //$NON-NLS-1$
- }
-
- try {
- // Before we do any de-configuration, verify that web.xml is
- // available for update
- IModelProvider provider = JAXRSUtils.getModelProvider(project);
- if (provider == null) {
- throw new JAXRSFacetException(NLS.bind(
- Messages.JAXRSFacetUninstallDelegate_ConfigErr,
- project.getName()));
- } else if (!(provider.validateEdit(null, null).isOK())) {
- throw new JAXRSFacetException(
- NLS
- .bind(
- Messages.JAXRSFacetUninstallDelegate_NonUpdateableWebXML,
- project.getName()));
- }
-
- // Remove JAXRS Libraries
- ( (JAXRSFacetUninstallConfig) config ).getLibrariesUninstallDelegate().execute( null );
-
- // remove servlet stuff from web.xml
- uninstallJAXRSReferencesFromWebApp(project, monitor);
-
- if (monitor != null) {
- monitor.worked(1);
- }
-
- } finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
- }
-
- private void uninstallJAXRSReferencesFromWebApp(final IProject project,
- final IProgressMonitor monitor) {
-
- IModelProvider provider = JAXRSUtils.getModelProvider(project);
- Object webAppObj = provider.getModelObject();
- if (webAppObj != null) {
- IPath ddPath = new Path("WEB-INF").append("web.xml"); //$NON-NLS-1$ //$NON-NLS-2$
- if (JAXRSJEEUtils.isWebApp25or30(webAppObj)) {
- WebApp webApp = (WebApp) webAppObj;
- Servlet servlet = JAXRSJEEUtils.findJAXRSServlet(webApp);
- if (servlet == null)
- return;
-
- provider.modify(new RemoveJAXRSFromJavaEEWebAppOperation(
- project), ddPath);
- } else {// 2.3 or 2.4 web app
- org.eclipse.jst.j2ee.webapplication.WebApp webApp = (org.eclipse.jst.j2ee.webapplication.WebApp) webAppObj;
- org.eclipse.jst.j2ee.webapplication.Servlet servlet = JAXRSJ2EEUtils
- .findJAXRSServlet(webApp);
- if (servlet == null)
- return;
-
- provider
- .modify(
- new RemoveJAXRSFromJ2EEWebAppOperation(project),
- ddPath);
- }
- }
- }
-
- static class RemoveJAXRSFromJavaEEWebAppOperation implements Runnable {
- private IProject _project;
-
- RemoveJAXRSFromJavaEEWebAppOperation(final IProject project) {
- this._project = project;
- }
-
- public void run() {
- WebApp webApp = (WebApp) ModelProviderManager.getModelProvider(
- _project).getModelObject();
- Servlet servlet = JAXRSJEEUtils.findJAXRSServlet(webApp);
-
- // remove jax-rs url mappings
- JAXRSJEEUtils.removeURLMappings(webApp, servlet);
- // remove servlet
- removeJAXRSServlet(webApp, servlet);
-
- }
-
- private void removeJAXRSServlet(final WebApp webApp,
- final Servlet servlet) {
- webApp.getServlets().remove(servlet);
- }
-
- }
-
- static class RemoveJAXRSFromJ2EEWebAppOperation implements Runnable {
- private IProject _project;
-
- RemoveJAXRSFromJ2EEWebAppOperation(final IProject project) {
- this._project = project;
- }
-
- public void run() {
- org.eclipse.jst.j2ee.webapplication.WebApp webApp = (org.eclipse.jst.j2ee.webapplication.WebApp) ModelProviderManager
- .getModelProvider(_project).getModelObject();
- org.eclipse.jst.j2ee.webapplication.Servlet servlet = JAXRSJ2EEUtils
- .findJAXRSServlet(webApp);
-
- // remove jax-rs url mappings
- JAXRSJ2EEUtils.removeURLMappings(webApp, servlet);
- // remove servlet
- removeJAXRSServlet(webApp, servlet);
-
- }
-
- private void removeJAXRSServlet(
- final org.eclipse.jst.j2ee.webapplication.WebApp webApp,
- final org.eclipse.jst.j2ee.webapplication.Servlet servlet) {
- webApp.getServlets().remove(servlet);
- }
-
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSFacetVersionChangeDelegate.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSFacetVersionChangeDelegate.java
deleted file mode 100644
index 07c4bda..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSFacetVersionChangeDelegate.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20100819 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS - provide means to change facet versions
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.project.facet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-/**
- * JAXRS Facet Version change Delegate for WTP faceted web projects.
- *
- * @since 3.2.2
- */
-public final class JAXRSFacetVersionChangeDelegate implements IDelegate {
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.wst.common.project.facet.core.IDelegate#execute(org.eclipse
- * .core.resources.IProject,
- * org.eclipse.wst.common.project.facet.core.IProjectFacetVersion,
- * java.lang.Object, org.eclipse.core.runtime.IProgressMonitor)
- */
- public void execute(final IProject project, final IProjectFacetVersion fv,
- final Object cfg, final IProgressMonitor monitor)
- throws CoreException
-
- {
-
- try {
- if (monitor != null) {
- monitor.beginTask("", 1); //$NON-NLS-1$
- //presently there is no difference between facet versions, nothing to do
- }
-
- } finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSJ2EEUtils.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSJ2EEUtils.java
deleted file mode 100644
index c8d3e02..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSJ2EEUtils.java
+++ /dev/null
@@ -1,403 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100303 291954 kchong@ca.ibm.com - Keith Chong, JAX-RS: Implement JAX-RS Facet
- * 20100325 307059 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS properties page- fields empty or incorrect
- * 20100408 308565 kchong@ca.ibm.com - Keith Chong, JAX-RS: Servlet name and class not updated
- * 20100618 307059 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS properties page- fields empty or incorrect
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.project.facet;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.webapplication.JSPType;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.ServletMapping;
-import org.eclipse.jst.j2ee.webapplication.ServletType;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * Utility file for Web 2.3 & 2.4 model
- *
- */
-public class JAXRSJ2EEUtils extends JAXRSUtils {
-
- /**
- * Convenience method for getting writeable WebApp model
- *
- * @param project
- * @return WebArtifactEdit
- * @deprecated - must use IModelProviders
- */
- public static WebArtifactEdit getWebArtifactEditForWrite(
- final IProject project) {
- return WebArtifactEdit.getWebArtifactEditForWrite(project);
- }
-
- /**
- * Convenience method for getting read-only WebApp model
- *
- * @param project
- * @return WebArtifactEdit
- * @deprecated - must use IModelProviders
- */
- public static WebArtifactEdit getWebArtifactEditForRead(
- final IProject project) {
- return WebArtifactEdit.getWebArtifactEditForRead(project);
- }
- @SuppressWarnings("unchecked")
- private static Servlet findJAXRSServletUsingLibraryProviderID(final Object webApp, String selectedLibraryProviderID) {
- Iterator<Servlet> it = null;
- Servlet toReturn = null;
- if (webApp == null)
- return null;
- else if (webApp instanceof WebApp)
- it = ((WebApp) webApp).getServlets().iterator();
-// See Bug 293103
-// else if (webApp instanceof org.eclipse.jst.javaee.web.WebApp)
-// it = ((org.eclipse.jst.javaee.web.WebApp) webApp).getServlets()
-// .iterator();
- else
- return null;
-
- while (it.hasNext()) {
- Servlet servlet = it.next();
-
- Iterator <Description> descIter = servlet.getDescriptions().iterator();
- while (descIter.hasNext())
- {
- Description desc = descIter.next();
- String value = desc.getValue();
- if (value != null && value.trim().startsWith(JAXRS_SERVLET_IDENTIFIER))
- {
- return servlet;
- }
- }
-
- if (servlet != null && servlet.getWebType() != null) {
-
- if (servlet.getWebType().isServletType()) {
- if (servlet.getServletName() != null
- && (servlet.getServletName().trim().equals(
- getSavedservletName()) || servlet
- .getServletName().trim().equals(
- JAXRS_DEFAULT_SERVLET_NAME))) {
- return servlet;
- }
-
- if (((ServletType) servlet.getWebType()).getClassName() != null
- && ((ServletType) servlet.getWebType()).getClassName().trim().equals(
- getSavedServletClassName(selectedLibraryProviderID))) {
- return servlet;
- }
-
- if (((ServletType) servlet.getWebType()).getClassName() != null
- && facetKnowsServletClassName(((ServletType) servlet.getWebType()).getClassName().trim()))
- return servlet;
- if (((ServletType) servlet.getWebType()).getClassName() != null
- && ((ServletType) servlet.getWebType()).getClassName().trim().equals(JAXRS_SERVLET_CLASS)) {
- if (toReturn == null)
- //found a servlet with empty servlet class, return that if find nothing else
- toReturn = servlet;
-
- }
-
- } else if (servlet.getWebType().isJspType()) {
- if (((JSPType) servlet.getWebType()).getJspFile() != null
- && ( ((JSPType) servlet.getWebType()).getJspFile()
- .trim().equals(JAXRS_SERVLET_CLASS) || ((JSPType) servlet.getWebType()).getJspFile()
- .trim().equals(getSavedservletName())) ) {
- return servlet;
- }
- }
- }
- }
-
- // if we get to here then we have finished the loop
- // without finding the servlet we're looking for
- return toReturn;
-
- }
- public static Servlet findJAXRSServlet(final Object webApp, String selectedLibraryProviderID) {
- return findJAXRSServletUsingLibraryProviderID(webApp, selectedLibraryProviderID);
- }
- /**
- * @param webApp
- * as Object
- * @return Servlet - the JAXRS Servlet for the specified WebApp or null if
- * not present
- */
- @SuppressWarnings("unchecked")
- public static Servlet findJAXRSServlet(final Object webApp) {
- return findJAXRSServletUsingLibraryProviderID(webApp, null);
- }
-
- /**
- * Creates servlet reference in WebApp if not present or updates servlet
- * name if found using the passed configuration.
- *
- * @param webApp
- * @param config
- * @param servlet
- * @return Servlet servlet - if passed servlet was null, will return created
- * servlet
- */
- @SuppressWarnings("unchecked")
- public static Servlet createOrUpdateServletRef(final WebApp webApp,
- final IDataModel config, Servlet servlet) {
-
- String displayName = getDisplayName(config);
- String className = getServletClassname(config);
-
- return createOrUpdateServletRef(webApp, displayName, className, servlet);
- }
-
- public static Servlet createOrUpdateServletRef(final WebApp webApp,
- String displayName, String className, Servlet servlet) {
-
- if (servlet == null) {
- // Create the servlet instance and set up the parameters from data
- // model
- servlet = WebapplicationFactory.eINSTANCE.createServlet();
- servlet.setServletName(displayName);
- servlet.setDescription(JAXRS_SERVLET_IDENTIFIER_DESCRIPTION);
-
- ServletType servletType = WebapplicationFactory.eINSTANCE
- .createServletType();
- servletType.setClassName(className);
- servlet.setWebType(servletType);
- servlet.setLoadOnStartup(Integer.valueOf(1));
- // Add the servlet to the web application model
- webApp.getServlets().add(servlet);
- } else {
- // update
- updateServletMappings(webApp, servlet, servlet.getServletName()
- .trim(), displayName);
- servlet.setServletName(displayName);
- ServletType servletType = WebapplicationFactory.eINSTANCE
- .createServletType();
- servletType.setClassName(className);
- servlet.setWebType(servletType);
- servlet.setLoadOnStartup(Integer.valueOf(1));
- Description jaxrsToolsDescription = null;
- Description next = null;
- List<Description> descriptions = servlet.getDescriptions();
- if (descriptions != null) {
- Iterator<Description> it = descriptions.iterator();
- while (it.hasNext()) {
- next = it.next();
- if (JAXRS_SERVLET_IDENTIFIER_DESCRIPTION.equals(next
- .getValue())) {
- jaxrsToolsDescription = next;
- break;
- }
- }
-
- }
- if (jaxrsToolsDescription == null) {
- // add the description for our JAX-RS tools
- servlet.setDescription(JAXRS_SERVLET_IDENTIFIER_DESCRIPTION);
- }
-
- }
- return servlet;
- }
-
- private static void updateServletMappings(final WebApp webApp,
- final Servlet servlet, final String servletName,
- final String newServletName) {
- List<ServletMapping> mappings = findServletMappings(webApp, servlet,
- servletName);
- for (ServletMapping map : mappings) {
- map.setName(newServletName);
- }
-
- }
-
- @SuppressWarnings("unchecked")
- private static List<ServletMapping> findServletMappings(
- final WebApp webApp, final Servlet servlet, final String servletName) {
- List<ServletMapping> mappings = new ArrayList<ServletMapping>();
- List<ServletMapping> allMappings = webApp.getServletMappings();
- for (int i = allMappings.size() - 1; i >= 0; --i) {
- ServletMapping mapping = allMappings.get(i);
- if (mapping != null
- && mapping.getServlet() != null
- && mapping.getServlet().getServletName() != null
- && mapping.getServlet().getServletName().trim().equals(
- servletName))
- mappings.add(mapping);
- }
- return mappings;
- }
-
- /**
- * @param webApp
- * as Object
- * @return true if webApp instanceof org.eclipse.jst.javaee.web.WebApp
- */
- public static boolean isWebApp25(final Object webApp) {
- if (webApp instanceof org.eclipse.jst.javaee.web.WebApp)
- return true;
- return false;
- }
-
- /**
- * Creates servlet-mappings for the servlet
- *
- * @param webApp
- * @param urlMappingList
- * - list of string values to be used in url-pattern for
- * servlet-mapping
- * @param servlet
- */
- @SuppressWarnings("unchecked")
- public static void setUpURLMappings(final WebApp webApp,
- final List urlMappingList, final Servlet servlet) {
- // Add mappings
- Iterator it = urlMappingList.iterator();
- while (it.hasNext()) {
- String pattern = (String) it.next();
- if (!(doesServletMappingExist(webApp, servlet, pattern))) {
- ServletMapping mapping = WebapplicationFactory.eINSTANCE
- .createServletMapping();
- mapping.setServlet(servlet);
- mapping.setName(servlet.getServletName());
- mapping.setUrlPattern(pattern);
- webApp.getServletMappings().add(mapping);
- }
- }
- }
-
- @SuppressWarnings("unchecked")
- public static void updateURLMappings(final WebApp webApp,
- final List urlMappingList, final Servlet servlet) {
- // TODO
- if (urlMappingList != null) {
- List<ServletMapping> mappings = findServletMappings(webApp,
- servlet, servlet.getServletName());
- Iterator it = urlMappingList.iterator();
- while (it.hasNext()) {
- String pattern = (String) it.next();
- if (!(doesServletMappingExist(webApp, servlet, pattern))) {
- ServletMapping mapping = WebapplicationFactory.eINSTANCE
- .createServletMapping();
- mapping.setServlet(servlet);
- mapping.setName(servlet.getServletName());
- mapping.setUrlPattern(pattern);
- webApp.getServletMappings().add(mapping);
- }
-
- }
- // Now gather up the patterns that aren't defined in the UI...
- List<ServletMapping> patternsToRemove = new ArrayList<ServletMapping>();
- for (Iterator<ServletMapping> iter = mappings.iterator(); iter.hasNext();)
- {
- ServletMapping next = iter.next();
- String patternTypeValue = next.getUrlPattern();
- if (patternTypeValue != null && !urlMappingList.contains(patternTypeValue))
- {
- patternsToRemove.add(next);
- }
- }
- //...and remove them from the model
- for (Iterator<ServletMapping> iter = patternsToRemove.iterator(); iter.hasNext(); )
- {
- webApp.getServletMappings().remove(iter.next());
- }
-
-
-
- }
- }
-
- @SuppressWarnings("unchecked")
- private static boolean doesServletMappingExist(final WebApp webApp,
- final Servlet servlet, final String pattern) {
-
- List<ServletMapping> mappings = webApp.getServletMappings();
- String servletName = servlet.getServletName();
- if (servletName != null) {
- for (int i = mappings.size() - 1; i >= 0; --i) {
- ServletMapping mapping = mappings.get(i);
- if (mapping != null
- && mapping.getServlet() != null
- && mapping.getServlet().getServletName() != null
- && mapping.getServlet().getServletName().trim().equals(
- servletName) && mapping.getUrlPattern() != null
- && mapping.getUrlPattern().trim().equals(pattern)) {
- return true;
- }
- }
- }
- return false;
- }
-
- /**
- * Removes servlet-mappings for servlet using servlet-name.
- *
- * @param webApp
- * @param servlet
- */
- @SuppressWarnings("unchecked")
- public static void removeURLMappings(final WebApp webApp,
- final Servlet servlet) {
- List<ServletMapping> mappings = webApp.getServletMappings();
- String servletName = servlet.getServletName();
- if (servletName != null) {
- for (int i = mappings.size() - 1; i >= 0; --i) {
- ServletMapping mapping = mappings.get(i);
- if (mapping != null
- && mapping.getServlet() != null
- && mapping.getServlet().getServletName() != null
- && mapping.getServlet().getServletName().trim().equals(
- servletName)) {
- mappings.remove(mapping);
- }
- }
- }
- }
-
- /**
- * @param webAppObj
- * as Object
- * @return true if webApp instanceof org.eclipse.jst.j2ee.web.WebApp and
- * versionID == 24
- */
- public static boolean isWebApp24(final Object webAppObj) {
- if (webAppObj instanceof WebApp
- && ((WebApp) webAppObj).getVersionID() == 24)
- return true;
- return false;
- }
-
- /**
- * @param webAppObj
- * as Object
- * @return true if webApp instanceof org.eclipse.jst.j2ee.web.WebApp and
- * versionID == 23
- */
- public static boolean isWebApp23(final Object webAppObj) {
- if (webAppObj instanceof WebApp
- && ((WebApp) webAppObj).getVersionID() == 23)
- return true;
- return false;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSJEEUtils.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSJEEUtils.java
deleted file mode 100644
index b9ff8c0..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSJEEUtils.java
+++ /dev/null
@@ -1,351 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100303 291954 kchong@ca.ibm.com - Keith Chong, JAX-RS: Implement JAX-RS Facet
- * 20100310 304405 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS Facet : support JAX-RS 1.1
- * 20100319 306594 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS facet install fails for Web 2.3 & 2.4
- * 20100325 307059 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS properties page- fields empty or incorrect
- * 20100408 308565 kchong@ca.ibm.com - Keith Chong, JAX-RS: Servlet name and class not updated
- * 20100618 307059 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS properties page- fields empty or incorrect
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.project.facet;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jst.javaee.core.Description;
-import org.eclipse.jst.javaee.core.JavaeeFactory;
-import org.eclipse.jst.javaee.core.UrlPatternType;
-import org.eclipse.jst.javaee.web.Servlet;
-import org.eclipse.jst.javaee.web.ServletMapping;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.javaee.web.WebAppVersionType;
-import org.eclipse.jst.javaee.web.WebFactory;
-import org.eclipse.jst.ws.jaxrs.core.internal.JAXRSCorePlugin;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * Utility file for Web 2.5 or 3.0 model
- */
-public class JAXRSJEEUtils extends JAXRSUtils {
-
- public static Servlet findJAXRSServlet(final WebApp webApp, String selectedLibraryProviderID) {
- return findJAXRSServletUsingLibraryProviderID(webApp, selectedLibraryProviderID);
- }
- /**
- * @param webApp
- * @return Servlet - the JAXRS Servlet for the specified WebApp or null if
- * not present
- */
- @SuppressWarnings("unchecked")
- public static Servlet findJAXRSServlet(final WebApp webApp) {
- return findJAXRSServletUsingLibraryProviderID(webApp, null);
- }
- private static Servlet findJAXRSServletUsingLibraryProviderID(final WebApp webApp, String selectedLibraryProviderID) {
- Iterator<Servlet> it = webApp.getServlets().iterator();
- Servlet toReturn = null;
- while (it.hasNext()) {
- Servlet servlet = it.next();
- Iterator <Description> descIter = servlet.getDescriptions().iterator();
- while (descIter.hasNext())
- {
- Description desc = descIter.next();
- String value = desc.getValue();
- if (value != null && value.trim().startsWith(JAXRS_SERVLET_IDENTIFIER))
- {
- return servlet;
- }
- }
- if (servlet.getServletName() != null
- && (servlet.getServletName().trim().equals(
- getSavedservletName()) || servlet
- .getServletName().trim().equals(
- JAXRS_DEFAULT_SERVLET_NAME))) {
- return servlet;
- }
-
- if (servlet.getServletClass() != null
- && servlet.getServletClass().trim().equals(
- getSavedServletClassName(selectedLibraryProviderID))) {
- return servlet;
- }
-
- if (servlet.getServletClass() != null
- && facetKnowsServletClassName(servlet.getServletClass().trim()))
- return servlet;
- if (servlet.getServletClass() != null
- && servlet.getServletClass().trim().equals(JAXRS_SERVLET_CLASS)) {
- if (toReturn == null)
- //found a servlet with empty servlet class, return that if find nothing else
- toReturn = servlet;
- }
-
- }
-
- // if we get to here then we have finished the loop
- // without finding the servlet we're looking for
- return toReturn;
- }
-
- private static String getSavedServletClassName() {
- IDialogSettings jaxrsUISettings = JAXRSCorePlugin.getDefault()
- .getJaxrsUISettings();
- if (jaxrsUISettings != null) {
- String JAXRSUISettingsRoot = "org.eclipse.jst.ws.jaxrs.ui" + ".jaxrsFacetInstall"; //$NON-NLS-1$
- IDialogSettings root = jaxrsUISettings
- .getSection(JAXRSUISettingsRoot);
-
- if (root != null)
- return root.get("servletClassname");
- }
- return null;
- }
-
- /**
- * Creates servlet reference in WebApp if not present or updates servlet
- * name if found using the passed configuration.
- *
- * @param webApp
- * @param config
- * @param servlet
- * @return Servlet servlet - if passed servlet was null, will return created
- * servlet
- */
- @SuppressWarnings("unchecked")
- public static Servlet createOrUpdateServletRef(final WebApp webApp,
- final IDataModel config, org.eclipse.jst.javaee.web.Servlet servlet) {
-
- String displayName = getDisplayName(config);
- String className = getServletClassname(config);
-
- return createOrUpdateServletRef(webApp, displayName, className, servlet);
- }
-
- @SuppressWarnings("unchecked")
- public static Servlet createOrUpdateServletRef(final WebApp webApp,
- String displayName, String className, org.eclipse.jst.javaee.web.Servlet servlet) {
-
- if (servlet == null) {
- // Create the servlet instance and set up the parameters from data
- // model
- servlet = WebFactory.eINSTANCE.createServlet();
- servlet.setServletName(displayName);
- servlet.setServletClass(className);
- servlet.setLoadOnStartup(Integer.valueOf(1));
- Description description = JavaeeFactory.eINSTANCE.createDescription();
- description.setValue(JAXRS_SERVLET_IDENTIFIER_DESCRIPTION);
- servlet.getDescriptions().add(description);
- // Add the servlet to the web application model
- webApp.getServlets().add(servlet);
-
- } else {
- updateServletMappings(webApp, servlet, displayName);
- servlet.setServletName(displayName);
- servlet.setServletClass(className);
- servlet.setLoadOnStartup(Integer.valueOf(1));
- Description jaxrsToolsDescription = null;
- Description next = null;
- List<Description> descriptions = servlet.getDescriptions();
- if (descriptions != null) {
- Iterator<Description> it = descriptions.iterator();
- while (it.hasNext()) {
- next = it.next();
- if (JAXRS_SERVLET_IDENTIFIER_DESCRIPTION.equals(next
- .getValue())) {
- jaxrsToolsDescription = next;
- break;
- }
- }
-
- }
- if (jaxrsToolsDescription == null) {
- // add the description for our JAX-RS tools
- Description description = JavaeeFactory.eINSTANCE
- .createDescription();
- description.setValue(JAXRS_SERVLET_IDENTIFIER_DESCRIPTION);
- servlet.getDescriptions().add(description);
- }
-
- }
- return servlet;
- }
-
- private static void updateServletMappings(final WebApp webApp,
- final Servlet servlet, final String displayName) {
- // update mappings for new name
- ServletMapping mapping = findServletMapping(webApp, servlet);
- if (mapping != null) {
- mapping.setServletName(displayName);
- }
-
- }
-
- /**
- * @param webAppObj
- * as Object
- * @return true if webApp instanceof org.eclipse.jst.javaee.web.WebApp and
- * WebAppVersionType._25
- */
- public static boolean isWebApp25(final Object webAppObj) {
- if (webAppObj instanceof WebApp
- && ((WebApp) webAppObj).getVersion() == WebAppVersionType._25_LITERAL)
- return true;
- return false;
- }
-
- /**
- * @param webAppObj
- * as Object
- * @return true if webApp instanceof org.eclipse.jst.javaee.web.WebApp and
- * WebAppVersionType._25 or WebAppVersionType._30
- */
- public static boolean isWebApp25or30(final Object webAppObj) {
- if (webAppObj instanceof WebApp
- && (((WebApp) webAppObj).getVersion() == WebAppVersionType._25_LITERAL || ((WebApp) webAppObj).getVersion() == WebAppVersionType._30_LITERAL))
- return true;
- return false;
- }
-
- /**
- * Creates servlet-mappings for the servlet for 2.5 WebModules or greater
- *
- * @param webApp
- * @param urlMappingList
- * - list of string values to be used in url-pattern for
- * servlet-mapping
- * @param servlet
- */
- @SuppressWarnings("unchecked")
- public static void setUpURLMappings(final WebApp webApp,
- final List urlMappingList, final Servlet servlet) {
-
- if (urlMappingList.size() > 0) {
- ServletMapping mapping = findServletMapping(webApp, servlet);
- if (mapping == null) {
- mapping = WebFactory.eINSTANCE.createServletMapping();
- mapping.setServletName(servlet.getServletName());
- webApp.getServletMappings().add(mapping);
- }
- // Add patterns
- Iterator it = urlMappingList.iterator();
- while (it.hasNext()) {
- String pattern = (String) it.next();
- if (!(doesServletMappingPatternExist(webApp, mapping, pattern))) {
- UrlPatternType urlPattern = JavaeeFactory.eINSTANCE
- .createUrlPatternType();
- urlPattern.setValue(pattern);
- mapping.getUrlPatterns().add(urlPattern);
- }
- else
- {
- mapping.getUrlPatterns().remove(pattern);
- }
- }
- }
- }
-
- @SuppressWarnings("unchecked")
- public static void updateURLMappings(final WebApp webApp,
- final List urlMappingList, final Servlet servlet) {
-
- if (urlMappingList != null) {
- ServletMapping mapping = findServletMapping(webApp, servlet);
- if (mapping == null) {
- mapping = WebFactory.eINSTANCE.createServletMapping();
- mapping.setServletName(servlet.getServletName());
- webApp.getServletMappings().add(mapping);
- }
- // Add patterns
- Iterator it = urlMappingList.iterator();
- while (it.hasNext()) {
- String pattern = (String) it.next();
- if (!(doesServletMappingPatternExist(webApp, mapping, pattern))) {
- UrlPatternType urlPattern = JavaeeFactory.eINSTANCE
- .createUrlPatternType();
- urlPattern.setValue(pattern);
- mapping.getUrlPatterns().add(urlPattern);
- }
- }
- // Now gather up the patterns that aren't defined in the UI...
- List<UrlPatternType> patternsToRemove = new ArrayList<UrlPatternType>();
- for (Iterator<UrlPatternType> iter = mapping.getUrlPatterns().iterator(); iter.hasNext();)
- {
- UrlPatternType aPatternType = iter.next();
- String patternTypeValue = aPatternType.getValue();
- if (patternTypeValue != null && !urlMappingList.contains(patternTypeValue))
- {
- patternsToRemove.add(aPatternType);
- }
- }
- //...and remove them from the model
- for (Iterator<UrlPatternType> iter = patternsToRemove.iterator(); iter.hasNext(); )
- {
- UrlPatternType aPatternType = iter.next();
- mapping.getUrlPatterns().remove(aPatternType);
- }
- }
- }
-
- @SuppressWarnings("unchecked")
- private static ServletMapping findServletMapping(final WebApp webApp,
- final Servlet servlet) {
- for (Iterator<ServletMapping> it = webApp.getServletMappings()
- .iterator(); it.hasNext();) {
- ServletMapping mapping = it.next();
- if (mapping.getServletName() != null
- && servlet.getServletName() != null
- && mapping.getServletName().trim().equals(
- servlet.getServletName().trim()))
- return mapping;
- }
- return null;
- }
-
- @SuppressWarnings("unchecked")
- private static boolean doesServletMappingPatternExist(final WebApp webApp,
- final ServletMapping mapping, final String pattern) {
- for (Iterator<UrlPatternType> it = mapping.getUrlPatterns().iterator(); it
- .hasNext();) {
- String patternTypeValue = it.next().getValue();
- if (patternTypeValue != null
- && pattern.equals(patternTypeValue.trim()))
- return true;
- }
- return false;
- }
-
- /**
- * Removes servlet-mappings for servlet using servlet-name for >= 2.5
- * WebModules.
- *
- * @param webApp
- * @param servlet
- */
- @SuppressWarnings("unchecked")
- public static void removeURLMappings(final WebApp webApp,
- final Servlet servlet) {
- List<ServletMapping> mappings = webApp.getServletMappings();
- String servletName = servlet.getServletName();
- if (servletName != null) {
- servletName = servletName.trim();
- for (int i = mappings.size() - 1; i >= 0; --i) {
- ServletMapping mapping = mappings.get(i);
- if (mapping != null && mapping.getServletName() != null
- && mapping.getServletName().trim().equals(servletName)) {
- mappings.remove(mapping);
- }
- }
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSLibraryValidator.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSLibraryValidator.java
deleted file mode 100644
index a12d263..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSLibraryValidator.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091109 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.project.facet;
-
-import org.eclipse.jst.common.project.facet.core.libprov.user.KeyClassesValidator;
-
-public class JAXRSLibraryValidator extends KeyClassesValidator
-{
-
-
- /**
- * Construct a validator for the JAXRS facet.
- */
- public JAXRSLibraryValidator ()
- {
- super();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSSharedLibraryProviderInstallOperationConfig.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSSharedLibraryProviderInstallOperationConfig.java
deleted file mode 100644
index 33000f5..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSSharedLibraryProviderInstallOperationConfig.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20100310 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.project.facet;
-
-import org.eclipse.jst.common.project.facet.core.libprov.user.UserLibraryProviderInstallOperationConfig;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class JAXRSSharedLibraryProviderInstallOperationConfig extends UserLibraryProviderInstallOperationConfig implements IJAXRSSharedLibraryProviderInstallOperationConfig {
- private boolean isSharedLibrary = true;
- private boolean isDeploy = false;
- private IDataModel model = null;
-
- public void setSharedLibrary(boolean isSharedLibrary)
- {
- this.isSharedLibrary = isSharedLibrary;
-// setIncludeWithApplicationEnabled(!isSharedLibrary);
- }
-
- public boolean isSharedLibrary()
- {
- return this.isSharedLibrary;
- }
-
- public void setIsDeploy(boolean isDeploy) {
- this.isDeploy = isDeploy;
- }
-
- public boolean isDeploy() {
- return this.isDeploy;
- }
-
- public void setModel(IDataModel model) {
- this.model = model;
- }
-
- public IDataModel getModel() {
- return model;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSUserLibraryProviderInstallOperation.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSUserLibraryProviderInstallOperation.java
deleted file mode 100644
index 3cfb154..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSUserLibraryProviderInstallOperation.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20100303 291954 kchong@ca.ibm.com - Keith Chong, JAX-RS: Implement JAX-RS Facet
- * 20100319 306595 ericdp@ca.ibm.com - Eric D. Peters, several install scenarios fail for both user library & non-user library
- * 20100324 306937 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS Properties page- NPE after pressing OK
- * 20100407 304749 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS Facet: install fails when choosing <None> runtime
- * 20100622 317306 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS Property page- RuntimeException when <None> runtime targeted
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.project.facet;
-
-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.IProgressMonitor;
-import org.eclipse.jst.common.project.facet.core.libprov.LibraryInstallDelegate;
-import org.eclipse.jst.common.project.facet.core.libprov.LibraryProviderOperationConfig;
-import org.eclipse.jst.j2ee.internal.common.classpath.WtpUserLibraryProviderInstallOperation;
-import org.eclipse.jst.j2ee.project.EarUtilities;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrssharedlibraryconfig.SharedLibraryConfigurator;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrssharedlibraryconfig.SharedLibraryConfiguratorUtil;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-import org.eclipse.wst.server.core.IRuntimeType;
-import org.eclipse.jst.server.core.FacetUtil;
-
-public class JAXRSUserLibraryProviderInstallOperation extends WtpUserLibraryProviderInstallOperation
-{
-
- public JAXRSUserLibraryProviderInstallOperation()
- {
- // TODO Auto-generated constructor stub
- }
-
- public void execute(final LibraryProviderOperationConfig libConfig, final IProgressMonitor monitor)
-
- throws CoreException
-
- {
- super.execute(libConfig, monitor);
-
- JAXRSUserLibraryProviderInstallOperationConfig cfg = (JAXRSUserLibraryProviderInstallOperationConfig) libConfig;
- // If config is null, we are on the properties page
- IDataModel config = cfg.getModel();
-
- IRuntime runtime = cfg.getFacetedProject().getPrimaryRuntime();
- IProject project = cfg.getFacetedProject().getProject();
-
- String targetRuntimeID = "";
- if (!onPropertiesPage(config)) {
- targetRuntimeID = config.getStringProperty(IJAXRSFacetInstallDataModelProperties.TARGETRUNTIME);
- } else {
- if (runtime != null) {
- org.eclipse.wst.server.core.IRuntime iruntime = FacetUtil.getRuntime(runtime);
- if (iruntime != null)
- {
- IRuntimeType rtType = iruntime.getRuntimeType();
- if (rtType != null)
- {
- targetRuntimeID = rtType.getId();
- }
- }
- }
- }
-
- IProject[] ears = EarUtilities.getReferencingEARProjects(project);
- SharedLibraryConfiguratorUtil.getInstance();
- java.util.List<SharedLibraryConfigurator> configurators = SharedLibraryConfiguratorUtil.getConfigurators();
- Iterator<SharedLibraryConfigurator> sharedLibConfiguratorIterator = configurators.iterator();
-
- if (onPropertiesPage(config) || cfg.isDeploy() || (!cfg.isDeploy() && !cfg.isSharedLibrary()))
- return;
-
- while (sharedLibConfiguratorIterator.hasNext())
- {
- SharedLibraryConfigurator thisConfigurator = sharedLibConfiguratorIterator.next();
- if (targetRuntimeID.equals(thisConfigurator.getRuntimeID()))
- {
- IProject earProject = null;
- Boolean addToEar = null;
- if (!onPropertiesPage(config))
- {
- earProject = getEARProject(config);
- addToEar = getAddToEar(config);
- }
- else
- {
- if (ears.length > 0)
- earProject = ears[0];
- else
- return;
- addToEar = new Boolean(true);
- }
- if (thisConfigurator.getIsSharedLibSupported(project, earProject, addToEar, ((LibraryInstallDelegate)config.getProperty(IJAXRSFacetInstallDataModelProperties.LIBRARY_PROVIDER_DELEGATE)).getLibraryProvider().getId())) // libref.getID()
- {
- thisConfigurator.installSharedLibs(project, earProject, monitor, cfg.getLibraryNames()); // libref.getID()
- break;
- }
- }
- }
- }
-
-private boolean onPropertiesPage(IDataModel config) {
- return config == null;
-}
-
- private IProject getEARProject(IDataModel config)
- {
- String projName = config.getStringProperty(IJAXRSFacetInstallDataModelProperties.EARPROJECT_NAME);
- if (projName == null || "".equals(projName))
- return null;
-
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
- return project;
- }
-
- private boolean getAddToEar(IDataModel config)
- {
- return config.getBooleanProperty(IJAXRSFacetInstallDataModelProperties.ADD_TO_EAR);
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSUserLibraryProviderInstallOperationConfig.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSUserLibraryProviderInstallOperationConfig.java
deleted file mode 100644
index 031d4d2..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSUserLibraryProviderInstallOperationConfig.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20100303 291954 kchong@ca.ibm.com - Keith Chong, JAX-RS: Implement JAX-RS Facet
- * 20100310 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.project.facet;
-
-import org.eclipse.jst.j2ee.internal.common.classpath.WtpUserLibraryProviderInstallOperationConfig;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class JAXRSUserLibraryProviderInstallOperationConfig extends
- WtpUserLibraryProviderInstallOperationConfig implements IJAXRSSharedLibraryProviderInstallOperationConfig {
-
- public JAXRSUserLibraryProviderInstallOperationConfig() {
- // TODO Auto-generated constructor stub
- }
-
-
- private boolean isSharedLibrary = true;
- private boolean isDeploy = false;
- private IDataModel model = null;
-
- public void setSharedLibrary(boolean isSharedLibrary)
- {
- this.isSharedLibrary = isSharedLibrary;
-// setIncludeWithApplicationEnabled(!isSharedLibrary);
- }
-
- public boolean isSharedLibrary()
- {
- return this.isSharedLibrary;
- }
-
- public void setIsDeploy(boolean isDeploy) {
- this.isDeploy = isDeploy;
- setIncludeWithApplicationEnabled(isDeploy);
- }
-
- public boolean isDeploy() {
- return this.isDeploy;
- }
-
- public void setModel(IDataModel model) {
- this.model = model;
- }
-
- public IDataModel getModel() {
- return model;
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSUtils.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSUtils.java
deleted file mode 100644
index 89db24b..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSUtils.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100325 307059 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS properties page- fields empty or incorrect
- * 20100408 308565 kchong@ca.ibm.com - Keith Chong, JAX-RS: Servlet name and class not updated
- * 20100618 307059 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS properties page- fields empty or incorrect
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.project.facet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.ws.jaxrs.core.internal.JAXRSCorePlugin;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryproviderconfig.JAXRSLibraryProviderUtil;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- *
- */
-public abstract class JAXRSUtils {
- /**
- * The default name for the JAX-RS servlet
- */
- public static final String JAXRS_DEFAULT_SERVLET_NAME = "JAX-RS Servlet"; //$NON-NLS-1$
- /**
- * The default name of the JAX-RS servlet class
- */
- public static final String JAXRS_SERVLET_CLASS = ""; //$NON-NLS-1$
-
- /**
- * Default URL mapping to jaxrs servlet
- */
- public static final String JAXRS_DEFAULT_URL_MAPPING = "/jaxrs/*"; //$NON-NLS-1$
-
- /**
- * the key for implementation libraries in persistent properties
- */
- public static final String PP_JAXRS_IMPLEMENTATION_LIBRARIES = "jaxrs.implementation.libraries"; //$NON-NLS-1$
-
- public static final String JAXRS_SERVLET_IDENTIFIER = "JAX-RS Tools Generated"; //$NON-NLS-1$
- public static final String JAXRS_SERVLET_IDENTIFIER_DESCRIPTION = "JAX-RS Tools Generated - Do not modify"; //$NON-NLS-1$
-
- /**
- * @param config
- * @return servlet display name to use from wizard data model
- */
- protected static String getDisplayName(IDataModel config) {
- String displayName = config
- .getStringProperty(IJAXRSFacetInstallDataModelProperties.SERVLET_NAME);
- if (displayName == null || displayName.trim().equals("")) //$NON-NLS-1$
- displayName = JAXRS_DEFAULT_SERVLET_NAME;
- return displayName.trim();
- }
-
- /**
- * @param config
- * @return servlet display name to use from wizard data model
- */
- protected static String getServletClassname(IDataModel config) {
- String className = config
- .getStringProperty(IJAXRSFacetInstallDataModelProperties.SERVLET_CLASSNAME);
- if (className == null || className.trim().equals("")) //$NON-NLS-1$
- className = JAXRS_SERVLET_CLASS;
- return className.trim();
- }
-
- /**
- * @param webProject
- * @return IModelProvider
- */
- public static IModelProvider getModelProvider(IProject webProject) {
- IModelProvider provider = ModelProviderManager
- .getModelProvider(webProject);
- Object webAppObj = provider.getModelObject();
- if (webAppObj == null) {
- return null;
- }
- return provider;
- }
-
- /**
- * The result of a servlet mapping search
- *
- */
- public static class MappingSearchResult {
- private final String _extensionMapping; // may be null;
- private final String _prefixMapping; // may be null
-
- MappingSearchResult(final String extensionMapping,
- final String prefixMapping) {
- _extensionMapping = extensionMapping;
- _prefixMapping = prefixMapping;
- }
-
- /**
- * @return true if the search yielded a valid result
- */
- public boolean isResult() {
- return _extensionMapping != null || _prefixMapping != null;
- }
-
- /**
- * @return the first extension mapping matching search criteria or null
- * if none
- */
- public final String getExtensionMapping() {
- return _extensionMapping;
- }
-
- /**
- * @return the first prefix mapping matching search criteria or null if
- * none
- */
- public final String getPrefixMapping() {
- return _prefixMapping;
- }
- }
-
- static String getSavedServletClassName(String libraryProviderID) {
- IDialogSettings jaxrsUISettings = JAXRSCorePlugin.getDefault()
- .getJaxrsUISettings();
- if (jaxrsUISettings != null) {
-
- String JAXRSUISettingsRoot = "org.eclipse.jst.ws.jaxrs.ui" + ".jaxrsFacetInstall"; //$NON-NLS-1$
- IDialogSettings root = jaxrsUISettings
- .getSection(JAXRSUISettingsRoot);
-
- if (root != null) {
- String toReturn = root.get(libraryProviderID + "servletClassname"); //$NON-NLS-1$
- if (toReturn == null)
- toReturn = root.get("servletClassname"); //$NON-NLS-1$
- return toReturn;
- }
- }
- return null;
- }
- static boolean facetKnowsServletClassName(String servletClassName) {
- return JAXRSLibraryProviderUtil.servletClassNameHasLibraryProvider(servletClassName);
- }
- /**
- * @deprecated
- * use org.eclipse.jst.ws.jaxrs.core.internal.project.facet.JAXRSUtils.getSavedservletName()
- */
- static String getSavedServletName() {
- IDialogSettings jaxrsUISettings = JAXRSCorePlugin.getDefault()
- .getJaxrsUISettings();
- if (jaxrsUISettings != null) {
- String JAXRSUISettingsRoot = "org.eclipse.jst.ws.jaxrs.ui" + ".jaxrsFacetInstall"; //$NON-NLS-1$
- IDialogSettings root = jaxrsUISettings
- .getSection(JAXRSUISettingsRoot);
-
- if (root != null)
- return root.get("servletClassname");
- }
- return null;
- }
-
- static String getSavedservletName() {
- IDialogSettings jaxrsUISettings = JAXRSCorePlugin.getDefault()
- .getJaxrsUISettings();
- if (jaxrsUISettings != null) {
- String JAXRSUISettingsRoot = "org.eclipse.jst.ws.jaxrs.ui" + ".jaxrsFacetInstall"; //$NON-NLS-1$
- IDialogSettings root = jaxrsUISettings
- .getSection(JAXRSUISettingsRoot);
-
- if (root != null)
- return root.get("servletName"); //$NON-NLS-1$
- }
- return null;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/UpdateWebXMLBase.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/UpdateWebXMLBase.java
deleted file mode 100644
index 432ed99..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/UpdateWebXMLBase.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20100303 291954 kchong@ca.ibm.com - Keith Chong, JAX-RS: Implement JAX-RS Facet
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.project.facet;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public abstract class UpdateWebXMLBase implements Runnable {
-
- public abstract void run();
-
- /**
- * @param config
- * @return list of URL patterns from the datamodel
- */
- protected List<String> getServletMappings(final IDataModel config) {
- List<String> mappings = new ArrayList<String>();
- String[] patterns = (String[]) config
- .getProperty(IJAXRSFacetInstallDataModelProperties.SERVLET_URL_PATTERNS);
- for (int i = 0; i < patterns.length; i++) {
- String pattern = patterns[i];
- mappings.add(pattern);
- }
-
- return mappings;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/UpdateWebXMLForJ2EE.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/UpdateWebXMLForJ2EE.java
deleted file mode 100644
index 0b5c1f6..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/UpdateWebXMLForJ2EE.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20100303 291954 kchong@ca.ibm.com - Keith Chong, JAX-RS: Implement JAX-RS Facet
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.project.facet;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class UpdateWebXMLForJ2EE extends UpdateWebXMLBase implements Runnable {
- private IProject project;
- private IDataModel config;
-
- public UpdateWebXMLForJ2EE(IProject project, final IDataModel config) {
- this.project = project;
- this.config = config;
- }
-
- public void run() {
- org.eclipse.jst.j2ee.webapplication.WebApp webApp = (org.eclipse.jst.j2ee.webapplication.WebApp) ModelProviderManager
- .getModelProvider(project).getModelObject();
- // create or update servlet ref
- org.eclipse.jst.j2ee.webapplication.Servlet servlet = JAXRSJ2EEUtils
- .findJAXRSServlet(webApp);// check to see
- // if already
- // present
-
- servlet = JAXRSJ2EEUtils.createOrUpdateServletRef(webApp, config,
- servlet);
-
- // init mappings
- List<String> listOfMappings = getServletMappings(config);
- JAXRSJ2EEUtils.setUpURLMappings(webApp, listOfMappings, servlet);
-
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/UpdateWebXMLForJavaEE.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/UpdateWebXMLForJavaEE.java
deleted file mode 100644
index fb6880e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/UpdateWebXMLForJavaEE.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20100303 291954 kchong@ca.ibm.com - Keith Chong, JAX-RS: Implement JAX-RS Facet
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.internal.project.facet;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.javaee.web.Servlet;
-import org.eclipse.jst.javaee.web.ServletMapping;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class UpdateWebXMLForJavaEE extends UpdateWebXMLBase implements Runnable {
- private IProject project;
- private IDataModel config;
- private Servlet servlet;
- private ServletMapping servletMapping;
- private String newServletName, newServletClass;
-
- public UpdateWebXMLForJavaEE(final IProject project, final IDataModel config) {
- this.project = project;
- this.config = config;
- }
-
- public UpdateWebXMLForJavaEE(final IProject project, Servlet servlet, ServletMapping servletMapping, String newServletName, String newServletClass) {
- this.project = project;
- this.servlet = servlet;
- this.servletMapping = servletMapping;
- this.newServletName = newServletName;
- this.newServletClass = newServletClass;
- }
-
- public void run() {
- WebApp webApp = (WebApp) ModelProviderManager.getModelProvider(
- project).getModelObject();
- // create or update servlet ref
- Servlet servlet = JAXRSJEEUtils.findJAXRSServlet(webApp);// check to
- // see
- // if already
-
- servlet = JAXRSJEEUtils.createOrUpdateServletRef(webApp, config, servlet);
-
- // init mappings
- List<String> listOfMappings = getServletMappings(config);
- JAXRSJEEUtils.setUpURLMappings(webApp, listOfMappings, servlet);
-
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrsappconfig/internal/JAXRSAppConfigUtils.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrsappconfig/internal/JAXRSAppConfigUtils.java
deleted file mode 100644
index a12bdc9..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrsappconfig/internal/JAXRSAppConfigUtils.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.jaxrsappconfig.internal;
-
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.ws.jaxrs.core.internal.IJAXRSCoreConstants;
-import org.eclipse.jst.ws.jaxrs.core.internal.JAXRSCorePlugin;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-/**
- * JAXRSAppConfigUtils provides utility methods useful in processing of a JAXRS
- * application configuration.
- *
- * @deprecated
- *
- * <p>
- * <b>Provisional API - subject to change - do not use</b>
- * </p>
- *
- */
-public class JAXRSAppConfigUtils {
-
-
- /**
- * Tests if the passed IProject instance is a valid JAXRS project in the
- * following ways:
- * <ul>
- * <li>project is not null and is accessible,</li>
- * <li>project has the JAXRS facet set on it.</li>
- * </ul>
- *
- * @param project
- * IProject instance to be tested.
- * @return true if the IProject instance is a valid JAXRS project, else
- * false.
- */
- public static boolean isValidJAXRSProject(IProject project) {
- boolean isValid = false;
- IProjectFacetVersion projectFacet = getProjectFacet(project);
- if (projectFacet != null) {
- isValid = true;
- }
- return isValid;
- }
-
- /**
- * Get the facet version for the project
- *
- * @param project
- * @return the project facet version or null if could not be found or if
- * project is not accessible
- */
- @SuppressWarnings("unchecked")
- public static IProjectFacetVersion getProjectFacet(IProject project) {
- // check for null or inaccessible project
- if (project != null && project.isAccessible()) {
- // check for JAXRS facet on project
- try {
- IFacetedProject facetedProject = ProjectFacetsManager
- .create(project);
- if (facetedProject != null) {
- Set projectFacets = facetedProject.getProjectFacets();
- Iterator itProjectFacets = projectFacets.iterator();
- while (itProjectFacets.hasNext()) {
- IProjectFacetVersion projectFacetVersion = (IProjectFacetVersion) itProjectFacets
- .next();
- if (IJAXRSCoreConstants.JAXRS_FACET_ID
- .equals(projectFacetVersion.getProjectFacet()
- .getId())) {
- return projectFacetVersion;
- }
- }
- }
- } catch (CoreException ce) {
- // log error
- JAXRSCorePlugin
- .log(IStatus.ERROR, ce.getLocalizedMessage(), ce);
- }
- }
- return null;
- }
-
- /**
- * Gets an IVirtualFolder instance which represents the root context's web
- * content folder.
- *
- * @param project
- * IProject instance for which to get the folder.
- * @return IVirtualFolder instance which represents the root context's web
- * content folder.
- */
- public static IVirtualFolder getWebContentFolder(IProject project) {
- IVirtualFolder folder = null;
- IVirtualComponent component = ComponentCore.createComponent(project);
- if (component != null) {
- folder = component.getRootFolder();
- }
- return folder;
- }
-
- /**
- * Gets an IPath instance representing the path of the passed IFile instance
- * relative to the web content folder.
- *
- * @param file
- * IFile instance for which a path is required.
- * @return IPath instance representing the path relative to the web content
- * folder.
- */
- public static IPath getWebContentFolderRelativePath(IFile file) {
- IPath path = null;
- if (file != null) {
- IVirtualFolder webContentFolder = getWebContentFolder(file
- .getProject());
- if (webContentFolder != null) {
- IPath webContentPath = webContentFolder
- .getProjectRelativePath();
- IPath filePath = file.getProjectRelativePath();
- int matchingFirstSegments = webContentPath
- .matchingFirstSegments(filePath);
- path = filePath.removeFirstSegments(matchingFirstSegments);
- }
- }
- return path;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrslibraryconfiguration/internal/AbstractJAXRSLibraryReferenceImpl.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrslibraryconfiguration/internal/AbstractJAXRSLibraryReferenceImpl.java
deleted file mode 100644
index db9dc89..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrslibraryconfiguration/internal/AbstractJAXRSLibraryReferenceImpl.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100420 309846 ericdp@ca.ibm.com - Eric D. Peters, Remove dead code related to e.p. pluginProvidedJaxrsLibraries
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.jaxrslibraryconfiguration.internal;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.ArchiveFile;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibrary;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryconfig.JAXRSLibraryInternalReference;
-/*
-* @deprecated
-*
-* <p>
-* <b>Provisional API - subject to change - do not use</b>
-* </p>
-*/
-public abstract class AbstractJAXRSLibraryReferenceImpl implements
- JAXRSLibraryReference {
-
- /**
- * The
- * {@link org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryconfig.JAXRSLibraryInternalReference}
- * being wrapped
- */
- protected JAXRSLibraryInternalReference libRef;
- private String _id;
- private String _label;
- private boolean _isDeloyed;
-
- /**
- * Constructor for "virtual" JAXRS Library References like "ServerSupplied"
- *
- * @param id
- * @param label
- * @param isImplementation
- */
- public AbstractJAXRSLibraryReferenceImpl(String id, String label) {
- _id = id;
- _label = label;
- }
-
- /**
- * Constructor non-virtual library references
- *
- * @param libRef
- * @param isDeployed
- */
- public AbstractJAXRSLibraryReferenceImpl(
- JAXRSLibraryInternalReference libRef, boolean isDeployed) {
- this.libRef = libRef;
- _isDeloyed = isDeployed;
- }
-
- public String getId() {
- if (libRef != null)
- return libRef.getID();
-
- return _id;
- }
-
- public String getLabel() {
- if (libRef != null)
- return libRef.getLabel();
-
- return _label;
- }
-
- public boolean isDeployed() {
- return _isDeloyed;
- }
-
- /**
- * @return the JAXRSLibrary underpinning the reference. May be null if the
- * library is missing or cannot be resolved from the registry.
- */
- protected JAXRSLibrary getLibrary() {
- return libRef.getLibrary();
- }
-
- @SuppressWarnings("unchecked")
- public Collection<IClasspathEntry> getJars() {
- Set<IClasspathEntry> results = new HashSet<IClasspathEntry>();
- if (getLibrary() != null) {
- List jars = getLibrary().getArchiveFiles();
- for (Iterator it = jars.iterator(); it.hasNext();) {
- ArchiveFile jar = (ArchiveFile) it.next();
- String path = jar.getResolvedSourceLocation();
- results.add(JavaCore
- .newLibraryEntry(new Path(path), null, null));
- }
- }
- return results;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.jst.ws.jaxrs.core.JAXRSLibraryconfiguration.JAXRSLibraryReference
- * #getName()
- */
- public String getName() {
- if (getLibrary() != null) {
- return getLibrary().getName();
- }
- return getId();
- }
-
- public String toString() {
- StringBuffer buf = new StringBuffer("id: ");
- buf.append(getId());
- buf.append(", label: ");
- buf.append(getLabel());
- buf.append(", isDeployed: ");
- buf.append(isDeployed());
-
- return buf.toString();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrslibraryconfiguration/internal/JAXRSLibraryConfigurationHelper.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrslibraryconfiguration/internal/JAXRSLibraryConfigurationHelper.java
deleted file mode 100644
index dd3146e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrslibraryconfiguration/internal/JAXRSLibraryConfigurationHelper.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100420 309846 ericdp@ca.ibm.com - Eric D. Peters, Remove dead code related to e.p. pluginProvidedJaxrsLibraries
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.jaxrslibraryconfiguration.internal;
-
-import java.util.Collection;
-import java.util.HashSet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxrs.core.internal.JAXRSCorePlugin;
-
-/**
- * Helper class for adopters needing to deal with JAXRS Library References
- *
- * <p>
- * <b>Provisional API - subject to change</b>
- * </p>
- *
- * @deprecated
- *
- */
-public final class JAXRSLibraryConfigurationHelper {
- /**
- * container id for JAXRS Library Classpath Containers
- */
- public static final String JAXRS_LIBRARY_CP_CONTAINER_ID = "org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibrarycontainer";
-
- /**
- * @param project
- * @return collection of references
- */
- public static Collection<JAXRSLibraryReference> getJAXRSLibraryReferences(
- IProject project) {
- Collection<JAXRSLibraryReference> results = new HashSet<JAXRSLibraryReference>();
- IJavaProject jproj = JavaCore.create(project);
- try {
- IClasspathEntry[] entries = jproj.getRawClasspath();
- for (int i = 0; i < entries.length; i++) {
- JAXRSLibraryReference ref = JAXRSLibraryReferenceFacadeFactory
- .create(entries[i]);
- if (ref != null) {
- results.add(ref);
- }
- }
- } catch (JavaModelException e) {
- JAXRSCorePlugin.log(e,
- "Exception occurred calling getJAXRSLibraryReferences for "
- + project.getName());
- }
- return results;
- }
-
- /**
- * @param cpEntry
- * @return boolean indicating that the classpath entry is a JAXRS Libary
- * Classpath Container
- */
- public static boolean isJAXRSLibraryContainer(IClasspathEntry cpEntry) {
- if (cpEntry.getEntryKind() != IClasspathEntry.CPE_CONTAINER)
- return false;
-
- IPath path = cpEntry.getPath();
- return path != null && path.segmentCount() == 2
- && JAXRS_LIBRARY_CP_CONTAINER_ID.equals(path.segment(0));
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrslibraryconfiguration/internal/JAXRSLibraryReference.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrslibraryconfiguration/internal/JAXRSLibraryReference.java
deleted file mode 100644
index aedec43..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrslibraryconfiguration/internal/JAXRSLibraryReference.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100420 309846 ericdp@ca.ibm.com - Eric D. Peters, Remove dead code related to e.p. pluginProvidedJaxrsLibraries
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.jaxrslibraryconfiguration.internal;
-
-import java.util.Collection;
-
-import org.eclipse.jdt.core.IClasspathEntry;
-
-/**
- * Represents a reference to a JAXRS Library on a project
- *
- *
- * @deprecated
- *
- * <p>
- * <b>Provisional API - subject to change - do not use</b>
- * </p>
- */
-public abstract interface JAXRSLibraryReference {
- /**
- * @return id for the library
- */
- public String getId();
-
- /**
- * @return name
- */
- public String getName();
-
- /**
- * @return collection of jars as {@link IClasspathEntry}s
- */
- public Collection<IClasspathEntry> getJars();
-
- /**
- * @return label user sees for this library
- */
- public String getLabel();
-
- /**
- * @return is deployed (marked as J2EE Module Dependency)
- */
- public boolean isDeployed();
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrslibraryconfiguration/internal/JAXRSLibraryReferenceFacadeFactory.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrslibraryconfiguration/internal/JAXRSLibraryReferenceFacadeFactory.java
deleted file mode 100644
index 26cf4c7..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrslibraryconfiguration/internal/JAXRSLibraryReferenceFacadeFactory.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100420 309846 ericdp@ca.ibm.com - Eric D. Peters, Remove dead code related to e.p. pluginProvidedJaxrsLibraries
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.jaxrslibraryconfiguration.internal;
-
-import org.eclipse.jdt.core.IClasspathAttribute;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jst.j2ee.classpathdep.IClasspathDependencyConstants;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.PluginProvidedJAXRSLibrary;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryconfig.JAXRSLibraryRegistryUtil;
-
-/**
- * Factory for producing facade objects for references to the internal EMF JAXRS
- * Library classes
- *
- * @deprecated
- *
- * <p>
- * <b>Provisional API - subject to change - do not use</b>
- * </p>
- */
-public class JAXRSLibraryReferenceFacadeFactory {
- /**
- * Returns a JAXRSLibraryReferenceUserSpecified (or
- * JAXRSLibraryReferenceUserDefined}) or JAXRSLibraryReferencePluginProvided
- * instance. Will not create a JAXRSLibraryReferenceServerSupplied as there
- * is no cp entry. Use createServerSuppliedJAXRSLibRef instead.
- *
- * @param classpathEntry
- * @return an instance of JAXRSLibraryInternalReference. Null will be
- * returned if the cpEntry is not a JAXRS Library reference.
- */
- public static JAXRSLibraryReference create(
- final IClasspathEntry classpathEntry) {
- if (JAXRSLibraryConfigurationHelper
- .isJAXRSLibraryContainer(classpathEntry)) {
- return createReference(classpathEntry);
- }
- return null;
- }
-
- /**
- * @param classpathEntry
- * @return {@link JAXRSLibraryReference}
- */
- private static JAXRSLibraryReference createReference(
- final IClasspathEntry classpathEntry) {
-
- String libID = classpathEntry.getPath().segment(1);
- org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryconfig.JAXRSLibraryInternalReference libRef = JAXRSLibraryRegistryUtil
- .getInstance().getJAXRSLibraryReferencebyID(libID);
- if (libRef != null) {
- boolean isDeployed = getJ2EEModuleDependency(classpathEntry);
- if (libRef.getLibrary() instanceof PluginProvidedJAXRSLibrary)
- return new JAXRSLibraryReferencePluginProvidedImpl(libRef,
- isDeployed);
-
- return new JAXRSLibraryReferenceUserSpecifiedImpl(libRef,
- isDeployed);
- }
- return null;
- }
-
- private static boolean getJ2EEModuleDependency(
- IClasspathEntry classpathEntry) {
- IClasspathAttribute[] attrs = classpathEntry.getExtraAttributes();
- for (int i = 0; i < attrs.length; i++) {
- IClasspathAttribute attr = attrs[i];
- if (attr
- .getName()
- .equals(
- IClasspathDependencyConstants.CLASSPATH_COMPONENT_DEPENDENCY)) {
- return true;
- }
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrslibraryconfiguration/internal/JAXRSLibraryReferencePluginProvided.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrslibraryconfiguration/internal/JAXRSLibraryReferencePluginProvided.java
deleted file mode 100644
index 8d5e021..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrslibraryconfiguration/internal/JAXRSLibraryReferencePluginProvided.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100420 309846 ericdp@ca.ibm.com - Eric D. Peters, Remove dead code related to e.p. pluginProvidedJaxrsLibraries
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.jaxrslibraryconfiguration.internal;
-
-/**
- * A reference to a plugin-defined JAXRS Library
- *
- * @deprecated
- *
- * <p>
- * <b>Provisional API - subject to change - do not use</b>
- * </p>
- */
-public interface JAXRSLibraryReferencePluginProvided extends
- JAXRSLibraryReferenceUserSpecified {
- /**
- * @return plugin id. May return null if plugin id cannot be determined.
- */
- public String getPluginId();
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrslibraryconfiguration/internal/JAXRSLibraryReferencePluginProvidedImpl.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrslibraryconfiguration/internal/JAXRSLibraryReferencePluginProvidedImpl.java
deleted file mode 100644
index befd045..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrslibraryconfiguration/internal/JAXRSLibraryReferencePluginProvidedImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100420 309846 ericdp@ca.ibm.com - Eric D. Peters, Remove dead code related to e.p. pluginProvidedJaxrsLibraries
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.jaxrslibraryconfiguration.internal;
-
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.PluginProvidedJAXRSLibrary;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryconfig.JAXRSLibraryInternalReference;
-
-/**
- *
- * @deprecated
- *
- * <p>
- * <b>Provisional API - subject to change - do not use</b>
- * </p>
- */
-public class JAXRSLibraryReferencePluginProvidedImpl extends
- AbstractJAXRSLibraryReferenceImpl implements
- JAXRSLibraryReferencePluginProvided {
-
- /**
- * Constructor
- *
- * @param libRef
- * @param isDeployed
- */
- public JAXRSLibraryReferencePluginProvidedImpl(
- JAXRSLibraryInternalReference libRef, boolean isDeployed) {
- super(libRef, isDeployed);
- }
-
- public String getPluginId() {
- if (getLibrary() != null)
- return ((PluginProvidedJAXRSLibrary) getLibrary()).getPluginID();
-
- return null;
- }
-
- public String toString() {
- StringBuffer buf = new StringBuffer("PluginProvided: (");
- buf.append(super.toString());
-
- return buf.toString();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrslibraryconfiguration/internal/JAXRSLibraryReferenceUserSpecified.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrslibraryconfiguration/internal/JAXRSLibraryReferenceUserSpecified.java
deleted file mode 100644
index a984037..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrslibraryconfiguration/internal/JAXRSLibraryReferenceUserSpecified.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100420 309846 ericdp@ca.ibm.com - Eric D. Peters, Remove dead code related to e.p. pluginProvidedJaxrsLibraries
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.jaxrslibraryconfiguration.internal;
-
-/**
- * Represents an reference to a user specified JAXRS Library
- *
- * @deprecated
- *
- * <p>
- * <b>Provisional API - subject to change - do not use</b>
- * </p>
- */
-public interface JAXRSLibraryReferenceUserSpecified extends
- JAXRSLibraryReference {
- //
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrslibraryconfiguration/internal/JAXRSLibraryReferenceUserSpecifiedImpl.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrslibraryconfiguration/internal/JAXRSLibraryReferenceUserSpecifiedImpl.java
deleted file mode 100644
index f5cba4d..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrslibraryconfiguration/internal/JAXRSLibraryReferenceUserSpecifiedImpl.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100420 309846 ericdp@ca.ibm.com - Eric D. Peters, Remove dead code related to e.p. pluginProvidedJaxrsLibraries
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.jaxrslibraryconfiguration.internal;
-
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryconfig.JAXRSLibraryInternalReference;
-
-/**
- * Implementation of a reference to a user specified JAXRS Library
- *
- * @deprecated
- *
- * <p>
- * <b>Provisional API - subject to change - do not use</b>
- * </p>
- */
-public class JAXRSLibraryReferenceUserSpecifiedImpl extends
- AbstractJAXRSLibraryReferenceImpl implements
- JAXRSLibraryReferenceUserSpecified {
- /**
- * @param libRef
- * of type {@link JAXRSLibraryInternalReference}
- * @param isDeployed
- */
- public JAXRSLibraryReferenceUserSpecifiedImpl(
- JAXRSLibraryInternalReference libRef, boolean isDeployed) {
-
- super(libRef, isDeployed);
- }
-
- /*
- * (non-Javadoc)
- *
- * @seeorg.eclipse.jst.ws.jaxrs.core.JAXRSLibraryconfiguration.internal.
- * AbstractJAXRSLibraryReferenceImpl#toString()
- */
- public String toString() {
- StringBuffer buf = new StringBuffer("UserSpecified: (");
- buf.append(super.toString());
- buf.append(")");
-
- return buf.toString();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrslibraryregistry/internal/InvalidArchiveFilesCreationException.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrslibraryregistry/internal/InvalidArchiveFilesCreationException.java
deleted file mode 100644
index 8140272..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrslibraryregistry/internal/InvalidArchiveFilesCreationException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100420 309846 ericdp@ca.ibm.com - Eric D. Peters, Remove dead code related to e.p. pluginProvidedJaxrsLibraries
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.jaxrslibraryregistry.internal;
-
-public class InvalidArchiveFilesCreationException extends Exception {
- private static final long serialVersionUID = 1L;
-
- /**
- * Creates an instance with the specified message.
- *
- * @param msg
- * This instance's message
- * @deprecated
- *
- * <p>
- * <b>Provisional API - subject to change - do not use</b>
- * </p>
- */
- public InvalidArchiveFilesCreationException(String msg) {
- super(msg);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrslibraryregistry/internal/JAXRSLibraryArchiveFilesDelegate.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrslibraryregistry/internal/JAXRSLibraryArchiveFilesDelegate.java
deleted file mode 100644
index 730210c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrslibraryregistry/internal/JAXRSLibraryArchiveFilesDelegate.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.jaxrslibraryregistry.internal;
-
-import java.util.Collection;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.ArchiveFile;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistryFactory;
-import org.osgi.framework.Bundle;
-
-/**
- * Abstract delegate class used by jaxrsLibraries ext-pt to return collection of
- * ArchiveFiles to PluginProvidedJAXRSLibraryCreationHelper.
- *
- * Caller must first setConfigurationElement(IConfigurationElement element)
- * before a call to getArchiveFiles().
- *
- * <p>
- * <b>Provisional API - subject to change</b>
- * </p>
- *
- * @deprecated along with the jaxrslibraries extension-point
- */
-public abstract class JAXRSLibraryArchiveFilesDelegate {
- private IConfigurationElement extPtElement;
- private String libID = null;
- private IPath pluginPath = null;
- private String pluginID;
- private String relativeDestLocation = "WEB-INF/lib"; //$NON-NLS-1$
-
- /**
- * Returns a Collection of
- * <code>org.eclipse.jst.ws.jaxrs.core.internal.JAXRSLibraryregistry.ArchiveFile</code>
- * instances.
- *
- * @return A Collection of
- * <code>org.eclipse.jst.ws.jaxrs.core.internal.JAXRSLibraryregistry.ArchiveFile</code>
- * instances
- */
- @SuppressWarnings("unchecked")
- public abstract Collection getArchiveFiles();
-
- /**
- * Sets the IConfigurationElement instance to be subsequently used to get
- * the plugin ID and the name defined for the JAXRS Library.
- *
- * @param extPtElement
- * IConfigurationElement instance
- */
- public final void setConfigurationElement(IConfigurationElement extPtElement) {
- this.extPtElement = extPtElement;
- }
-
- /**
- * Constructs an instance.
- */
- public JAXRSLibraryArchiveFilesDelegate() {
- super();
- }
-
- /**
- * Sets the relative destination location subsequently used to set the
- * corresponding property on each created ArchiveFile.
- *
- * @param relPath
- * Relative destination location for ArchiveFile instances
- */
- protected void setRelativeDestinationLocation(String relPath) {
- relativeDestLocation = relPath;
- }
-
- /**
- * Returns ArchiveFile where the location is set relative to the plugin. As
- * long as the ArchiveFile is on the local machine somewhere, it should be
- * locatable.
- *
- * @param relativePathFileName
- * Relative location of the ArchiveFile
- * @return ArchiveFile instance.
- */
- protected ArchiveFile createArchiveFile(String relativePathFileName) {
- ArchiveFile file = JAXRSLibraryRegistryFactory.eINSTANCE
- .createArchiveFile();
- file.setRelativeToWorkspace(false);
- file.setSourceLocation(relativePathFileName);
- file.setRelativeDestLocation(relativeDestLocation);
- return file;
- }
-
- /**
- * Returns the JAXRSLibrary ID as set on the extension point.
- *
- * @return JAXRSLibrary ID
- */
- protected String getLibID() {
- if (libID == null) {
- StringBuffer buf = new StringBuffer(getPluginID());
- buf
- .append("/").append(extPtElement.getAttribute(PluginProvidedJAXRSLibraryCreationHelper.NAME)); //$NON-NLS-1$
- libID = buf.toString();
- }
- return libID;
- }
-
- /**
- * Returns the plugin's path.
- *
- * @return The plugin's path.
- */
- protected IPath getPluginPath() {
- if (pluginPath == null) {
- Bundle bundle = Platform.getBundle(getPluginID());
- pluginPath = new Path(bundle.getLocation());
- }
- return pluginPath;
- }
-
- /**
- * Returns the plugin's ID.
- *
- * @return The plugin's ID.
- */
- private String getPluginID() {
- if (pluginID == null) {
- pluginID = extPtElement.getDeclaringExtension().getContributor()
- .getName();
- }
- return pluginID;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrslibraryregistry/internal/PluginProvidedJAXRSLibraryArchiveFilesDelegate.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrslibraryregistry/internal/PluginProvidedJAXRSLibraryArchiveFilesDelegate.java
deleted file mode 100644
index 11b3089..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrslibraryregistry/internal/PluginProvidedJAXRSLibraryArchiveFilesDelegate.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100420 309846 ericdp@ca.ibm.com - Eric D. Peters, Remove dead code related to e.p. pluginProvidedJaxrsLibraries
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.jaxrslibraryregistry.internal;
-
-
-/**
- * Abstract class to be used for supplying the jar file names for a plugin
- * provided JAXRS Library. <br>
- * Adopters must implement getArchiveFiles() making use of the
- * addArchiveFile(String pluginRootRelativePath) method. <br>
- * <em>Note: A plugin providing jaxrs libraries cannot be jarred at this time. </em>
- * <br>
- * <br>
- * ex. <br>
- *
- * <pre>
- * <code>public void getArchiveFiles() {
- * addArchiveFile("/lib/JAR1.jar");
- * addArchiveFile("/lib/JAR2.jar");
- * }
- * </code>
- * </pre>
- *
- * @deprecated
- *
- * <p>
- * <b>Provisional API - subject to change - do not use</b>
- * </p>
- *
- */
-public abstract class PluginProvidedJAXRSLibraryArchiveFilesDelegate {
- private PluginProvidedJAXRSLibraryCreationHelper2 helper;
-
- /**
- * Constructs an instance.
- */
- public PluginProvidedJAXRSLibraryArchiveFilesDelegate() {
- super();
- }
-
- /**
- * Concrete delegate must implement this method to define jars in the
- * library. Use addJarFile(String pluginRootRelativePath) within this method
- * to add jars to the library.
- * @throws Exception
- */
- public abstract void getArchiveFiles();
-
- /**
- * Adds jar file to the library. Verification of file existence does not
- * occur at this point.
- *
- * Jar must be specified as being relative to the plugin. ex.
- * "/lib/MyJar.jar" where the lib directory is a child of the root.
- *
- * @param pluginRootRelativePath
- */
- protected void addArchiveFile(String pluginRootRelativePath) {
- helper.addArchiveFile(pluginRootRelativePath);// getArchiveFiles().add(helper.createArchiveFile(pluginRootRelativePath));
- }
-
-
- protected void addArchiveFileFromFullPath(String path) throws Exception {
- helper.addArchiveFileFromFullPath(path);
- }
-
- /**
- * Not to be implemented by subclasses
- *
- * @param helper
- */
- public void setCreationHelper(
- PluginProvidedJAXRSLibraryCreationHelper2 helper) {
- this.helper = helper;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrslibraryregistry/internal/PluginProvidedJAXRSLibraryCreationHelper.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrslibraryregistry/internal/PluginProvidedJAXRSLibraryCreationHelper.java
deleted file mode 100644
index 04fbeff..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrslibraryregistry/internal/PluginProvidedJAXRSLibraryCreationHelper.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.jaxrslibraryregistry.internal;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jst.ws.jaxrs.core.internal.JAXRSCorePlugin;
-import org.eclipse.jst.ws.jaxrs.core.internal.Messages;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.ArchiveFile;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistryFactory;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibrary;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.PluginProvidedJAXRSLibrary;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Helper class used to create JAXRS Libraries from the
- * <code>org.eclipse.jst.ws.jaxrs.core.jaxrslibraries</code> extension-point.
- *
- * <p>
- * <b>Provisional API - subject to change</b>
- * </p>
- *
- * @deprecated - clients should not use
- */
-public final class PluginProvidedJAXRSLibraryCreationHelper {
- private IConfigurationElement config_element;
-
- /**
- * Key of the 'name' attribute of the extension point.
- */
- public final static String NAME = "name"; //$NON-NLS-1$
- /**
- * Key of the 'isImplementation' attribute of the extension point.
- */
- public final static String IS_IMPL = "isImplementation"; //$NON-NLS-1$
- /**
- * Key of the 'archiveFilesDelegate' attribute of the extension point.
- */
- public final static String DELEGATE = "archiveFilesDelegate"; //$NON-NLS-1$
-
- /**
- * Creates an instance with the specified IConfigurationElement instance.
- *
- * @param JAXRSLibrary
- * IConfigurationElement instance
- */
- public PluginProvidedJAXRSLibraryCreationHelper(
- IConfigurationElement JAXRSLibrary) {
- this.config_element = JAXRSLibrary;
- }
-
- /**
- * Creates a new PluginProvidedJAXRSLibrary from the JAXRSLibrary extension
- * point.
- *
- * @return PluginProvidedJAXRSLibrary instance.
- */
- public JAXRSLibrary create() {
- PluginProvidedJAXRSLibrary newLib = JAXRSLibraryRegistryFactory.eINSTANCE
- .createPluginProvidedJAXRSLibrary();
- newLib.setPluginID(getPluginID());
- newLib.setName(config_element.getAttribute(NAME));
- try {
- addArchives(newLib);
- return newLib;
- } catch (Exception e) {
- JAXRSCorePlugin
- .log(
- e,
- NLS
- .bind(
- Messages.PluginProvidedJAXRSLibraryCreationHelper_ErrorCreating,
- newLib.getName()));
- }
- return null;
- }
-
- /**
- * Adds ArchiveFile instances to the specified JAXRSLibrary instance.
- *
- * @param newLib
- * JAXRSLibrary instance
- * @throws InvalidArchiveFilesCreationException
- * on attempt to create multiple instances at same location.
- * @throws CoreException
- * on core failure.
- */
- @SuppressWarnings("unchecked")
- private void addArchives(JAXRSLibrary newLib)
- throws InvalidArchiveFilesCreationException, CoreException {
- JAXRSLibraryArchiveFilesDelegate jarCol = null;
- ArchiveFile jar = null;
-
- jarCol = (JAXRSLibraryArchiveFilesDelegate) config_element
- .createExecutableExtension(DELEGATE);
- if (jarCol != null) {
- jarCol.setConfigurationElement(config_element);
- Collection jars = jarCol.getArchiveFiles();
- if (jars == null)// TODO: better validation and error handling
- return;
- Iterator it = jars.iterator();
- while (it.hasNext()) {
- Object aJar = it.next();
- if (aJar instanceof ArchiveFile) {// for now check to see
- // ArchiveFiles were being
- // returned
- jar = (ArchiveFile) aJar;
- if (!newLib.containsArchiveFile(jar.getSourceLocation()))
- newLib.getArchiveFiles().add(jar);
- } else {
- throw new InvalidArchiveFilesCreationException(
- NLS
- .bind(
- Messages.PluginProvidedJAXRSLibraryCreationHelper_ErrorMultipleDefinition,
- jar.getSourceLocation(),
- config_element.getName()));
- }
-
- }
- }
- }
-
- /**
- * Returns the plugin's ID.
- *
- * @return The plugin's ID
- */
- private String getPluginID() {
- return config_element.getDeclaringExtension().getContributor()
- .getName();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrslibraryregistry/internal/PluginProvidedJAXRSLibraryCreationHelper2.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrslibraryregistry/internal/PluginProvidedJAXRSLibraryCreationHelper2.java
deleted file mode 100644
index 68ffe7f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/jaxrslibraryregistry/internal/PluginProvidedJAXRSLibraryCreationHelper2.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100420 309846 ericdp@ca.ibm.com - Eric D. Peters, Remove dead code related to e.p. pluginProvidedJaxrsLibraries
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.core.jaxrslibraryregistry.internal;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jst.ws.jaxrs.core.internal.JAXRSCorePlugin;
-import org.eclipse.jst.ws.jaxrs.core.internal.Messages;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.ArchiveFile;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibrary;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.JAXRSLibraryRegistryFactory;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrsibraryregistry.PluginProvidedJAXRSLibrary;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Helper class used to create plugin-rovided JAXRS Libraries from the
- * <code>org.eclipse.jst.ws.jaxrs.core.pluginProvidedJaxrsLibraries</code>
- * extension-point. <br>
- *
- * @deprecated
- *
- * <p>
- * <b>Provisional API - subject to change - do not use</b>
- * </p>
- */
-public final class PluginProvidedJAXRSLibraryCreationHelper2 {
- private PluginProvidedJAXRSLibrary newLib;
- private IConfigurationElement config_element;
- private String relativeDestLocation = "WEB-INF/lib"; //$NON-NLS-1$
-
- /**
- * Key of the 'name' attribute of the extension point.
- */
- public final static String NAME = "name"; //$NON-NLS-1$
- /**
- * Key of the 'archiveFilesDelegate' attribute of the extension point.
- */
- public final static String DELEGATE = "archiveFilesDelegate"; //$NON-NLS-1$
- /**
- * Key of the 'label' attribute of the extension point.
- */
- public final static String LABEL = "label"; //$NON-NLS-1$
-
- /**
- * Creates an instance with the specified IConfigurationElement instance.
- *
- * @param JAXRSLibrary
- * IConfigurationElement instance
- */
- public PluginProvidedJAXRSLibraryCreationHelper2(
- IConfigurationElement JAXRSLibrary) {
- this.config_element = JAXRSLibrary;
- }
-
- /**
- * Add a jar file to the library
- *
- * @param pluginRootRelativePath
- */
- @SuppressWarnings("unchecked")
- public void addArchiveFile(String pluginRootRelativePath) {
- ArchiveFile jar = createArchiveFile(pluginRootRelativePath);
- if (!newLib.containsArchiveFile(jar.getSourceLocation()))
- newLib.getArchiveFiles().add(jar);
- }
-
- @SuppressWarnings("unchecked")
- public void addArchiveFileFromFullPath(String path) throws Exception {
- ArchiveFile jar = createArchiveFileFromFullPath(path);
- if (!newLib.containsArchiveFile(jar.getSourceLocation()))
- newLib.getArchiveFiles().add(jar);
- }
-
- private ArchiveFile createArchiveFileFromFullPath(String path) {
- ArchiveFile file = JAXRSLibraryRegistryFactory.eINSTANCE
- .createArchiveFile();
- file.setRelativeToWorkspace(false);
- file.setSourceLocation(path);
- file.setRelativeDestLocation(relativeDestLocation);
- return file;
- }
-
- /**
- * Creates a new PluginProvidedJAXRSLibrary from the JAXRSLibrary extension
- * point.
- *
- * @return PluginProvidedJAXRSLibrary instance.
- */
- public JAXRSLibrary create() {
- newLib = JAXRSLibraryRegistryFactory.eINSTANCE
- .createPluginProvidedJAXRSLibrary();
- newLib.setPluginID(getPluginID());
- newLib.setName(config_element.getAttribute(NAME));
- String label = config_element.getAttribute(LABEL);
- if (label != null && label.length() > 0) {
- newLib.setLabel(label);
- }
-
- try {
- addArchives();
- return newLib;
- } catch (Exception e) {
- JAXRSCorePlugin
- .log(
- e,
- NLS
- .bind(
- Messages.PluginProvidedJAXRSLibraryCreationHelper_ErrorCreating,
- newLib.getName()));
- }
- return null;
- }
-
- /**
- * Adds ArchiveFile instances to the specified JAXRSLibrary instance.
- *
- * @param newLib
- * JAXRSLibrary instance
- * @throws CoreException
- * on core failure.
- */
- private void addArchives() throws Exception {
- PluginProvidedJAXRSLibraryArchiveFilesDelegate jarCol = null;
-
- jarCol = (PluginProvidedJAXRSLibraryArchiveFilesDelegate) config_element
- .createExecutableExtension(DELEGATE);
- if (jarCol != null) {
- jarCol.setCreationHelper(this);
- jarCol.getArchiveFiles();
- }
- }
-
- /**
- * Returns ArchiveFile where the location is set relative to the plugin. As
- * long as the ArchiveFile is on the local machine somewhere, it should be
- * locatable.
- *
- * @param relativePathFileName
- * Relative location of the ArchiveFile
- * @return ArchiveFile instance.
- */
- private ArchiveFile createArchiveFile(String pluginRootRelativePath) {
- ArchiveFile file = JAXRSLibraryRegistryFactory.eINSTANCE
- .createArchiveFile();
- file.setRelativeToWorkspace(false);
- file.setSourceLocation(pluginRootRelativePath);
- file.setRelativeDestLocation(relativeDestLocation);
- return file;
- }
-
- /**
- * Returns the plugin's ID.
- *
- * @return The plugin's ID
- */
- private String getPluginID() {
- return config_element.getDeclaringExtension().getContributor()
- .getName();
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.ui/.classpath b/bundles/org.eclipse.jst.ws.jaxrs.ui/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.ui/.cvsignore b/bundles/org.eclipse.jst.ws.jaxrs.ui/.cvsignore
deleted file mode 100644
index 117a1fe..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.ui/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-@dot*
-temp.folder
-build.xml
-javaCompiler...args
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.ui/.project b/bundles/org.eclipse.jst.ws.jaxrs.ui/.project
deleted file mode 100644
index 568c095..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxrs.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/bundles/org.eclipse.jst.ws.jaxrs.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.jaxrs.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 6d7279b..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,29 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
-Bundle-SymbolicName: org.eclipse.jst.ws.jaxrs.ui;singleton:=true
-Bundle-Version: 1.0.303.qualifier
-Bundle-Activator: org.eclipse.jst.ws.jaxrs.ui.internal.JAXRSUIPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.jst.ws.jaxrs.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.wst.common.project.facet.ui;bundle-version="[1.4.100,2.0.0)",
- org.eclipse.core.resources;bundle-version="[3.5.100,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.400,2.0.0)",
- org.eclipse.wst.common.frameworks.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.6.0,3.0.0)",
- org.eclipse.jst.server.core;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.wst.server.core;bundle-version="[1.1.202,2.0.0)",
- org.eclipse.jst.common.project.facet.core;bundle-version="[1.4.100,2.0.0)",
- org.eclipse.jst.common.project.facet.ui;bundle-version="[1.4.100,2.0.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jem.util;bundle-version="[2.1.0,3.0.0)",
- org.eclipse.jem;bundle-version="[2.0.400,3.0.0)"
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.jst.ws.jaxrs.ui.internal;
- org.eclipse.jst.ws.jaxrs.ui.internal.classpath;
- org.eclipse.jst.ws.jaxrs.ui.internal.project.facet
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: org.eclipse.jst.common.project.facet.ui.libprov
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.ui/about.html b/bundles/org.eclipse.jst.ws.jaxrs.ui/about.html
deleted file mode 100644
index 4af3750..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.ui/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>October, 2009</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.ui/build.properties b/bundles/org.eclipse.jst.ws.jaxrs.ui/build.properties
deleted file mode 100644
index 088f01d..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.ui/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- icons/,\
- plugin.properties,\
- about.html
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.ui/icons/full/wizban/addlibrary_wiz.gif b/bundles/org.eclipse.jst.ws.jaxrs.ui/icons/full/wizban/addlibrary_wiz.gif
deleted file mode 100644
index 128c9d1..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.ui/icons/full/wizban/addlibrary_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.ui/icons/obj16/jar_l_obj.gif b/bundles/org.eclipse.jst.ws.jaxrs.ui/icons/obj16/jar_l_obj.gif
deleted file mode 100644
index 6cb185c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.ui/icons/obj16/jar_l_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.ui/icons/obj16/jar_obj.gif b/bundles/org.eclipse.jst.ws.jaxrs.ui/icons/obj16/jar_obj.gif
deleted file mode 100644
index 2fa1d77..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.ui/icons/obj16/jar_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.ui/icons/obj16/library_obj.gif b/bundles/org.eclipse.jst.ws.jaxrs.ui/icons/obj16/library_obj.gif
deleted file mode 100644
index cb55e33..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.ui/icons/obj16/library_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.ui/plugin.properties b/bundles/org.eclipse.jst.ws.jaxrs.ui/plugin.properties
deleted file mode 100644
index 75df1c9..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.ui/plugin.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2009, 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-plugin.name=JAX-RS Tools - UI
-PLUGIN_PROVIDER=Eclipse Web Tools Platform
-preferencepage.jaxrslibraries.name=JAX-RS Libraries
-classpathContainerPage.name.0 =JAX-RS Libraries
-jaxrs.library.property.page =JAX-RS (REST Web Services)
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.ui/plugin.xml b/bundles/org.eclipse.jst.ws.jaxrs.ui/plugin.xml
deleted file mode 100644
index 8c1cfe6..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.ui/plugin.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
- <!-- JAX-RS Project Facet -->
- <extension point="org.eclipse.ui.propertyPages">
- <page
- category="org.eclipse.wst.common.project.facet.ui.FacetsPropertyPage"
- class="org.eclipse.jst.ws.jaxrs.ui.internal.project.facet.JAXRSLibraryPropertyPage"
- id="org.eclipse.jst.ws.jaxrs.ui.internal.project.facet.JAXRSLibraryPropertyPage"
- name="%jaxrs.library.property.page">
- <enabledWhen>
- <adapt type="org.eclipse.core.resources.IProject">
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.jaxrs"/>
- </adapt>
- </enabledWhen>
- </page>
- </extension>
- <extension
- point="org.eclipse.wst.common.project.facet.ui.wizardPages">
- <wizard-pages action="jst.jaxrs.v10.install">
- <page class="org.eclipse.jst.ws.jaxrs.ui.internal.project.facet.JAXRSFacetInstallPage"/>
- </wizard-pages>
- <wizard-pages action="jst.jaxrs.v11.install">
- <page class="org.eclipse.jst.ws.jaxrs.ui.internal.project.facet.JAXRSFacetInstallPage"/>
- </wizard-pages>
-
- </extension>
-
- <extension point="org.eclipse.jst.common.project.facet.ui.libraryProviderActionPanels">
- <panel
- provider="jaxrs-user-library-provider"
- class="org.eclipse.jst.ws.jaxrs.ui.internal.project.facet.JAXRSUserLibraryProviderInstallPanel"/>
- </extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/IJAXRSUIConstants.java b/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/IJAXRSUIConstants.java
deleted file mode 100644
index adb106c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/IJAXRSUIConstants.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20091106 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100324 306937 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS Properties page- NPE after pressing OK
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.ui.internal;
-
-import org.eclipse.jst.ws.jaxrs.ui.internal.JAXRSUIPlugin;
-
-/**
- * JAXRS Core framework constants
- *
- * <p>
- * <b>Provisional API - subject to change</b>
- * </p>
- *
- */
-public final class IJAXRSUIConstants {
- /**
- * The root value for saved settings
- */
- public static final String SETTINGS_ROOT = JAXRSUIPlugin.PLUGIN_ID
- + ".jaxrsFacetInstall"; //$NON-NLS-1$
- public static final String USER_LIBRARY_ID = "jaxrs-user-library-provider"; //$NON-NLS-1$
-
- private IJAXRSUIConstants() {
- // no instantiation
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/JAXRSUIPlugin.java b/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/JAXRSUIPlugin.java
deleted file mode 100644
index e08c501..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/JAXRSUIPlugin.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20091106 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.ui.internal;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.jst.ws.jaxrs.core.internal.JAXRSCorePlugin;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * JAXRS UI plugin.
- */
-public class JAXRSUIPlugin extends AbstractUIPlugin {
-
- /**
- * The plugin id
- */
- public static final String PLUGIN_ID = "org.eclipse.jst.ws.jaxrs.ui"; //$NON-NLS-1$
- // The shared instance.
- private static JAXRSUIPlugin plugin;
-
- /**
- * The constructor.
- */
- public JAXRSUIPlugin() {
- plugin = this;
- }
-
- /**
- * This method is called upon plug-in activation
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- JAXRSCorePlugin.getDefault().setJAXRSUIDialogSettings(
- getDialogSettings());
- }
-
- /**
- * This method is called when the plug-in is stopped
- */
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- plugin = null;
- }
-
- /**
- * Returns the shared instance.
- *
- * @return the default plugin instance
- */
- public static JAXRSUIPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns an image descriptor for the image file at the given plug-in
- * relative path.
- *
- * @param path
- * the path
- * @return the image descriptor
- */
- public static ImageDescriptor getImageDescriptor(String path) {
- path = "icons/" + path; //$NON-NLS-1$
- return AbstractUIPlugin.imageDescriptorFromPlugin(
- "org.eclipse.jst.ws.jaxrs.ui", path); //$NON-NLS-1$
- }
-
- /**
- * Returns a shared image for the given name
- * <p>
- * Note: Images returned from this method will be automitically disposed of
- * when this plug-in shuts down. Callers must not dispose of these images
- * themselves.
- * </p>
- *
- * @param name
- * the image name found in /icons (with extension)
- * @return the image, null on error or not found.
- */
- public Image getImage(String name) {
- if (name == null) {
- return null;
- }
-
- ImageRegistry images = getImageRegistry();
- Image image = images.get(name);
- if (image == null) {
- try {
- final URL pluginBase = getBundle().getEntry("/");
- ;
- ImageDescriptor id = ImageDescriptor.createFromURL(new URL(
- pluginBase, "icons/" + name));
- images.put(name, id);
-
- image = images.get(name);
- } catch (MalformedURLException ee) {
- // log.CommonPlugin.image.error=Image {0} not found.
- // .error("log.msg", "log.CommonPlugin.image.error", name, ee);
- log(IStatus.ERROR, "Loading image", ee);
- }
- }
- return image;
- }
-
- /**
- * @return the plugin id
- */
- public String getPluginID() {
- return PLUGIN_ID;
- }
-
- /**
- * Logs using the default ILog implementation provided by getLog().
- *
- * @param severity
- * Severity (IStatus constant) of log entry
- * @param message
- * Human-readable message describing log entry
- * @param ex
- * Throwable instance (can be null)
- */
- public static void log(int severity, String message, Throwable ex) {
- getDefault().getLog().log(
- new Status(severity, PLUGIN_ID, IStatus.OK, message, ex));
- }
-
- /**
- * Logs using the default ILog implementation provided by getLog().
- *
- * @param severity
- * Severity (IStatus constant) of log entry
- * @param message
- * Human-readable message describing log entry
- */
- public static void log(int severity, String message) {
- log(severity, message, null);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/Messages.java b/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/Messages.java
deleted file mode 100644
index 2abaf7a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/Messages.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20091106 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100303 291954 kchong@ca.ibm.com - Keith Chong, JAX-RS: Implement JAX-RS Facet
- * 20100413 307552 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS and Java EE 6 setup is incorrect
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.ui.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * String resource handler.
- *
- */
-public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.jst.ws.jaxrs.ui.internal.messages"; //$NON-NLS-1$
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- public static String JAXRSFacetInstallPage_title;
- public static String JAXRSFacetInstallPage_description;
- public static String JAXRSFacetInstallPage_JAXRSServletLabel;
- public static String JAXRSFacetInstallPage_JAXRSImplementationLibrariesFrame;
- public static String JAXRSFacetInstallPage_Add2;
- public static String JAXRSFacetInstallPage_JAXRSServletNameLabel;
- public static String JAXRSFacetInstallPage_JAXRSServletClassNameLabel;
- public static String JAXRSFacetInstallPage_JAXRSURLMappingLabel;
- public static String JAXRSFacetInstallPage_PatternDialogTitle;
- public static String JAXRSFacetInstallPage_PatternDialogDesc;
- public static String JAXRSFacetInstallPage_Remove;
- public static String JAXRSFacetInstallPage_PatternEmptyMsg;
- public static String JAXRSFacetInstallPage_PatternSpecifiedMsg;
- public static String JAXRSFacetInstallPage_ErrorNoWebAppDataModel;
- public static String JAXRSFacetInstallPage_UpdateDD;
-
- public static String JAXRSLibraryConfigControl_IncludeGroupLabel;
- public static String JAXRSLibraryConfigControl_DeployButtonLabel;
- public static String JAXRSLibraryConfigControl_DeployJAR;
- public static String JAXRSLibraryConfigControl_SharedLibButtonLabel;
- public static String JAXRSLibraryConfigControl_TooltipIncludeAsSharedLib;
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/classpath/JAXRSLibraryValidationEvent.java b/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/classpath/JAXRSLibraryValidationEvent.java
deleted file mode 100644
index e086164..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/classpath/JAXRSLibraryValidationEvent.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20091106 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100420 309846 ericdp@ca.ibm.com - Eric D. Peters, Remove dead code related to e.p. pluginProvidedJaxrsLibraries
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.ui.internal.classpath;
-
-import org.eclipse.core.runtime.IStatus;
-
-/**
- * Validation event used by JAXRSLibraryControl to notify containers of updates
- *
- * @deprecated
- *
- * <p>
- * <b>Provisional API - subject to change - do not use</b>
- * </p>
- */
-public class JAXRSLibraryValidationEvent {
- private String msg;
- private int severity;
-
- /**
- * Constructor
- *
- * @param msg
- * @param severity
- * - IStatus int value
- */
- public JAXRSLibraryValidationEvent(String msg, int severity) {
- this.msg = msg;
- this.severity = severity;
- }
-
- /**
- * Constructs event with severity of IStatus.ERROR
- *
- * @param msg
- */
- public JAXRSLibraryValidationEvent(String msg) {
- this(msg, IStatus.ERROR);
- }
-
- /**
- * @return validation message
- */
- public String getMessage() {
- return msg;
- }
-
- /**
- * @return IStatus int value
- */
- public int getSeverity() {
- return severity;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/classpath/JAXRSLibraryValidationListener.java b/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/classpath/JAXRSLibraryValidationListener.java
deleted file mode 100644
index 2aea54e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/classpath/JAXRSLibraryValidationListener.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20091106 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100420 309846 ericdp@ca.ibm.com - Eric D. Peters, Remove dead code related to e.p. pluginProvidedJaxrsLibraries
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.ui.internal.classpath;
-
-/**
- * Listeners of {@link JAXRSLibraryValidationEvent}s should implement
- *
- * @deprecated
- *
- * <p>
- * <b>Provisional API - subject to change - do not use</b>
- * </p>
- */
-public interface JAXRSLibraryValidationListener {
- /**
- * Callback
- *
- * @param e
- */
- public void notifyValidation(JAXRSLibraryValidationEvent e);
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/messages.properties b/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/messages.properties
deleted file mode 100644
index a987b97..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/messages.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-###############################################################################
-# Copyright (c) 2009, 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-# yyyymmdd bug Email and other contact information
-# -------- -------- -----------------------------------------------------------
-# 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
-# 20091106 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
-# 20100303 291954 kchong@ca.ibm.com - Keith Chong, JAX-RS: Implement JAX-RS Facet
-# 20100413 307552 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS and Java EE 6 setup is incorrect
-###############################################################################
-JAXRSFacetInstallPage_title=JAX-RS Capabilities
-JAXRSFacetInstallPage_description=Add JAX-RS capabilities to this Web Project
-JAXRSFacetInstallPage_JAXRSImplementationLibrariesFrame=JAX-RS &Implementation Library
-JAXRSFacetInstallPage_JAXRSServletLabel=Servlet Information
-JAXRSFacetInstallPage_Add2=&Add...
-JAXRSFacetInstallPage_JAXRSServletNameLabel=JAX-RS &servlet name:
-JAXRSFacetInstallPage_JAXRSServletClassNameLabel=JAX-RS servlet c&lass name:
-JAXRSFacetInstallPage_JAXRSURLMappingLabel=&URL mapping patterns:
-JAXRSFacetInstallPage_PatternDialogTitle=Specify URL Pattern
-JAXRSFacetInstallPage_PatternDialogDesc=URL Pattern
-JAXRSFacetInstallPage_Remove=&Remove
-JAXRSFacetInstallPage_PatternEmptyMsg=Pattern must not be empty
-JAXRSFacetInstallPage_PatternSpecifiedMsg=Pattern is already specified
-JAXRSFacetInstallPage_ErrorNoWebAppDataModel=Unable to locate WebApp datamodel
-JAXRSFacetInstallPage_UpdateDD=Update Deployment Descriptor
-
-JAXRSLibraryConfigControl_DeployJAR=Deploy jars to WEB-INF/lib
-JAXRSLibraryConfigControl_DeployButtonLabel=Deploy
-JAXRSLibraryConfigControl_IncludeGroupLabel=Include library with this application
-JAXRSLibraryConfigControl_SharedLibButtonLabel=Shared Library
-JAXRSLibraryConfigControl_TooltipIncludeAsSharedLib=Include as shared library
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/project/facet/JAXRSFacetIncludeLibrariesGroup.java b/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/project/facet/JAXRSFacetIncludeLibrariesGroup.java
deleted file mode 100644
index 577f7d1..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/project/facet/JAXRSFacetIncludeLibrariesGroup.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20100310 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100512 312640 kchong@ca.ibm.com - JAX-RS facet - Extraneous spacing needs to be removed.
- *
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.ui.internal.project.facet;
-
-import org.eclipse.jst.ws.jaxrs.ui.internal.JAXRSUIPlugin;
-import org.eclipse.jst.ws.jaxrs.ui.internal.Messages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-
-public class JAXRSFacetIncludeLibrariesGroup extends Composite {
-
- private Button btnDeployJars;
- private Button btnSharedLibrary;
- Button copyOnPublishCheckBox;
- private Composite includeLibRadiosComposite;
-
- public JAXRSFacetIncludeLibrariesGroup(Composite parent, int style) {
- super(parent, style);
-
- // Set layout of this composite so its children will expand to fill available space.
- GridLayout gridLayout = new GridLayout(1, true);
- gridLayout.marginHeight = 0;
- gridLayout.marginWidth = 0;
- gridLayout.verticalSpacing = 0;
- gridLayout.horizontalSpacing = 0;
- setLayout(gridLayout);
- setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- // Children should have 'this' composite as their parent
- copyOnPublishCheckBox = new Button(this, SWT.CHECK);
- copyOnPublishCheckBox.setText(Messages.JAXRSLibraryConfigControl_IncludeGroupLabel);
- includeLibRadiosComposite = new Composite(this, SWT.NONE);
- GridLayout gridlayout = new GridLayout();
- gridlayout.numColumns = 1;
- gridlayout.marginTop = 0;
- gridlayout.marginBottom = 0;
- gridlayout.marginRight = 0;
- gridlayout.marginLeft = 10;
-
- includeLibRadiosComposite.setLayout(gridlayout);
- GridData griddata = new GridData(GridData.FILL_HORIZONTAL);
- includeLibRadiosComposite.setLayoutData(griddata);
-
- btnDeployJars = createRadioButton(includeLibRadiosComposite, Messages.JAXRSLibraryConfigControl_DeployButtonLabel, Messages.JAXRSLibraryConfigControl_DeployJAR, null);
-
- btnSharedLibrary = createRadioButton(includeLibRadiosComposite, Messages.JAXRSLibraryConfigControl_SharedLibButtonLabel, Messages.JAXRSLibraryConfigControl_TooltipIncludeAsSharedLib, null);
-
- copyOnPublishCheckBox.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(final SelectionEvent event)
- {
- boolean selection = copyOnPublishCheckBox.getSelection();
- btnDeployJars.setEnabled(selection);
- btnSharedLibrary.setEnabled(selection);
-
- }
- });
- // Need to initialize this properly
- btnDeployJars.setSelection(true);
-
- }
-
- public Button getBtnDeployJars() {
- return btnDeployJars;
- }
-
- public Button getBtnSharedLibrary() {
- return btnSharedLibrary;
- }
-
- public Button getCopyOnPublishCheckBox() {
- return copyOnPublishCheckBox;
- }
-
- public Composite getIncludeLibRadiosComposite() {
- return includeLibRadiosComposite;
- }
-
- private Button createButton(int kind, Composite parent, String labelName, String tooltip, String infopop)
- {
- Button button = new Button(parent, kind);
-
- tooltip = tooltip == null ? labelName : tooltip;
- button.setText(labelName);
- button.setToolTipText(tooltip);
-
- if (infopop != null)
- PlatformUI.getWorkbench().getHelpSystem().setHelp(button, JAXRSUIPlugin.PLUGIN_ID + "." + infopop);
-
- return button;
- }
-
- private Button createCheckbox(Composite parent, String labelName, String tooltip, String infopop)
- {
- return createButton(SWT.CHECK, parent, labelName, tooltip, infopop);
- }
-
- private Button createRadioButton(Composite parent, String labelName, String tooltip, String infopop)
- {
- return createButton(SWT.RADIO, parent, labelName, tooltip, infopop);
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/project/facet/JAXRSFacetInstallPage.java b/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/project/facet/JAXRSFacetInstallPage.java
deleted file mode 100644
index 7ebbd3a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/project/facet/JAXRSFacetInstallPage.java
+++ /dev/null
@@ -1,700 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20091106 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100302 304405 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS Facet : support JAX-RS 1.1 (JSR 311)
- * 20100303 291954 kchong@ca.ibm.com - Keith Chong, JAX-RS: Implement JAX-RS Facet
- * 20100310 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100324 306937 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS Properties page- NPE after pressing OK
- * 20100413 307552 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS and Java EE 6 setup is incorrect
- * 20100428 310905 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS facet fails to install due to NPE or runtime exception due to duplicate cp entries
- * 20100519 313576 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS tools- validation problems
- * 20100618 307059 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS properties page- fields empty or incorrect
- * 20100820 323192 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS- Not prompted to enter servlet class when adding JAX-RS facet to a new web project
- * 20101123 330916 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS - facet install should consider Web project associated with multiple EARs
- * 20110822 355434 atosak@ca.ibm.com - Atosa Khoddamhazrati, JAX-RS Facet assumes a project has a runtime when enabling the facet
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.ui.internal.project.facet;
-
-import java.util.ArrayList;
-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.IStatus;
-import org.eclipse.jface.dialogs.DialogSettings;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jst.common.project.facet.core.libprov.ILibraryProvider;
-import org.eclipse.jst.common.project.facet.core.libprov.LibraryInstallDelegate;
-import org.eclipse.jst.common.project.facet.core.libprov.LibraryProviderOperationConfig;
-import org.eclipse.jst.common.project.facet.core.libprov.internal.LibraryProvider;
-import org.eclipse.jst.common.project.facet.ui.libprov.LibraryProviderFrameworkUi;
-import org.eclipse.jst.j2ee.project.EarUtilities;
-import org.eclipse.jst.j2ee.project.WebUtilities;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.server.core.FacetUtil;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryproviderconfig.JAXRSLibraryProviderUtil;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrssharedlibraryconfig.SharedLibraryConfiguratorUtil;
-import org.eclipse.jst.ws.jaxrs.core.internal.project.facet.IJAXRSFacetInstallDataModelProperties;
-import org.eclipse.jst.ws.jaxrs.core.internal.project.facet.JAXRSSharedLibraryProviderInstallOperationConfig;
-import org.eclipse.jst.ws.jaxrs.core.internal.project.facet.JAXRSUserLibraryProviderInstallOperationConfig;
-import org.eclipse.jst.ws.jaxrs.ui.internal.IJAXRSUIConstants;
-import org.eclipse.jst.ws.jaxrs.ui.internal.JAXRSUIPlugin;
-import org.eclipse.jst.ws.jaxrs.ui.internal.Messages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IPreset;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.core.runtime.internal.BridgedRuntime;
-import org.eclipse.wst.common.project.facet.ui.IFacetWizardPage;
-import org.eclipse.wst.common.project.facet.ui.IWizardContext;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IRuntimeType;
-
-/**
- * JAXRS Facet installation wizard page.
- *
- */
-@SuppressWarnings("restriction")
-public class JAXRSFacetInstallPage extends DataModelWizardPage implements IJAXRSFacetInstallDataModelProperties, IFacetWizardPage
-{
- // UI
- private ServletInformationGroup servletInfoGroup;
-
- private IDialogSettings dialogSettings;
- private IDataModel webAppDataModel;
- private String sEARProject = null;
- private String sWEBProject = null;
- private IWizardContext context;
- private String sTargetRuntime = null;
- private IRuntime targetRuntime = null;
- private boolean bAddToEAR = false;
- private static final String SETTINGS_SERVLET = "servletName"; //$NON-NLS-1$
- private static final String SETTINGS_SERVLET_CLASSNAME = "servletClassname"; //$NON-NLS-1$
- private static final String SETTINGS_URL_MAPPINGS = "urlMappings"; //$NON-NLS-1$
- private static final String SETTINGS_URL_PATTERN = "pattern"; //$NON-NLS-1$
- private Button updateDDCheckBox;
- private Composite composite = null;
- private java.util.List<IProject> earProjects = null;
- private IPreset selectedPreset = null;
- private ILibraryProvider currentlySelectedLibraryType;
- private boolean isProjectCreationMode = true; // project creation = true,
- // add/remove facets mode =
- // false
-
- /**
- * Zero argument constructor
- */
- public JAXRSFacetInstallPage()
- {
- super(DataModelFactory.createDataModel(new AbstractDataModelProvider()
- {/*
- * do nothing
- */
- }), "jaxrs.facet.install.page"); //$NON-NLS-1$
- setTitle(Messages.JAXRSFacetInstallPage_title);
- setDescription(Messages.JAXRSFacetInstallPage_description);
- dialogSettings = JAXRSUIPlugin.getDefault().getDialogSettings();
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage
- * #createTopLevelComposite(org.eclipse.swt.widgets.Composite)
- */
- protected Composite createTopLevelComposite(final Composite parent)
- {
- initializeDialogUnits(parent);
- composite = new Composite(parent, SWT.NONE);
- final GridLayout jaxrsCompositeLayout = new GridLayout(1, false);
- jaxrsCompositeLayout.marginTop = 0;
- jaxrsCompositeLayout.marginBottom = 0;
- jaxrsCompositeLayout.marginRight = 0;
- jaxrsCompositeLayout.marginLeft = 0;
- composite.setLayout(jaxrsCompositeLayout);
-
- final LibraryInstallDelegate librariesInstallDelegate = (LibraryInstallDelegate) getDataModel().getProperty(LIBRARY_PROVIDER_DELEGATE);
-
- currentlySelectedLibraryType = librariesInstallDelegate == null ? null : librariesInstallDelegate.getLibraryProvider();
- librariesInstallDelegate.getLibraryProviders();
- java.util.List<ILibraryProvider> providers = librariesInstallDelegate.getLibraryProviders();
- if (providers != null) {
- for (ILibraryProvider provider : providers) {
- if (provider != null) {
- if (provider instanceof LibraryProvider) {
- if (!provider.isAbstract()) {
- LibraryProviderOperationConfig config = librariesInstallDelegate
- .getLibraryProviderOperationConfig(provider);
-
- if (config instanceof JAXRSUserLibraryProviderInstallOperationConfig) {
- JAXRSUserLibraryProviderInstallOperationConfig customConfig = (JAXRSUserLibraryProviderInstallOperationConfig) config;
- customConfig.setModel(getDataModel());
- } else if (config instanceof JAXRSSharedLibraryProviderInstallOperationConfig) {
- JAXRSSharedLibraryProviderInstallOperationConfig customConfig = (JAXRSSharedLibraryProviderInstallOperationConfig) config;
- customConfig.setModel(getDataModel());
- }
- }
- }
- }
- }
- }
-
- final Control librariesComposite = LibraryProviderFrameworkUi.createInstallLibraryPanel(composite, librariesInstallDelegate, Messages.JAXRSFacetInstallPage_JAXRSImplementationLibrariesFrame);
-
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 3;
-
- librariesComposite.setLayoutData(gd);
- updateDDCheckBox = new Button(composite, SWT.CHECK);
- updateDDCheckBox.setText(Messages.JAXRSFacetInstallPage_UpdateDD);
- updateDDCheckBox.addSelectionListener(
- new SelectionAdapter() {
- public void widgetSelected(final SelectionEvent event) {
- servletInfoGroup.setFieldsEnabled(updateDDCheckBox.getSelection());
- }
- });
-
- servletInfoGroup = new ServletInformationGroup(composite, SWT.NONE);
- servletInfoGroup.setDataModel(model);
- updateUpdateDDState(librariesInstallDelegate.getLibraryProvider().getId());
-
- addModificationListeners();
-
- return composite;
- }
-
-private void updateUpdateDDState(String libraryProviderID) {
- boolean bUserLibrary = libraryProviderID.equals(IJAXRSUIConstants.USER_LIBRARY_ID);
- if (bUserLibrary) {
- updateDDCheckBox.setVisible(isJEE6orGreater());
- } else
- updateDDCheckBox.setVisible(showUpdateDDCheckBox(libraryProviderID));
- if (updateDDCheckBox.getVisible()) {
- boolean selected;
- if (!bUserLibrary)
- selected = getUpdateDDCheckBoxSelected(libraryProviderID);
- else
- selected = true;
- servletInfoGroup.setFieldsEnabled(selected);
- updateDDCheckBox.setSelection(selected);
- updateDDCheckBox.getSelection();
- }
- if (updateDDCheckBox.getVisible())
- model.setBooleanProperty(IJAXRSFacetInstallDataModelProperties.UPDATEDD, updateDDCheckBox.getSelection());
- else
- model.setBooleanProperty(IJAXRSFacetInstallDataModelProperties.UPDATEDD, true);
-}
-
- @SuppressWarnings("rawtypes")
- private boolean isJEE6orGreater() {
- sWEBProject = this.context.getProjectName();
- Iterator it = this.context.getSelectedProjectFacets().iterator();
- IProjectFacetVersion webFacetVersion = null;
- while (it.hasNext()) {
- // find Web facet
- IProjectFacetVersion pfv = (IProjectFacetVersion) it.next();
- if (pfv.getProjectFacet().getId().equals("jst.web")) { //$NON-NLS-1$
- webFacetVersion = pfv;
- break;
- }
- }
- if (webFacetVersion != null) {
- if (webFacetVersion.equals(WebUtilities.DYNAMIC_WEB_30))
- return true;
-
- }
-
- return false;
- }
-
-private boolean getUpdateDDCheckBoxSelected(String libraryProviderID) {
- return JAXRSLibraryProviderUtil.isUpdateDDCheckBoxSelectedByDefault(libraryProviderID);
-}
-
-private boolean showUpdateDDCheckBox(String libraryProviderID) {
- if (libraryProviderID.equals(IJAXRSUIConstants.USER_LIBRARY_ID))
- return true;
- return JAXRSLibraryProviderUtil.isUpdateDDCheckBoxSupportAvailable(libraryProviderID);
-}
-
-private void initializeValues()
- {
- IDialogSettings root = dialogSettings.getSection(IJAXRSUIConstants.SETTINGS_ROOT);
-
- if (!this.isProjectCreationMode)
- {
- // We are in add/remove facets mode
- IProject webProject = SharedLibraryConfiguratorUtil.getWebProject(model);
- if (webProject != null)
- {
- try
- {
- IFacetedProject fProject = ProjectFacetsManager.create(webProject);
- // Get the runtime associated with this project
- org.eclipse.wst.common.project.facet.core.runtime.IRuntime facetRuntime = fProject.getPrimaryRuntime();
- if (facetRuntime != null)
- {
- IRuntime runtime = FacetUtil.getRuntime(facetRuntime);
- if (runtime != null)
- {
- IRuntimeType rtType = runtime.getRuntimeType();
- if (rtType != null)
- {
- sTargetRuntime = rtType.getId();
- }
- // Now, set the property
- model.setStringProperty(IJAXRSFacetInstallDataModelProperties.TARGETRUNTIME, sTargetRuntime);
- }
- }
- }
- catch (CoreException e)
- {
- // We should have a faceted project
- }
- }
- String earName = model.getStringProperty(IJAXRSFacetInstallDataModelProperties.EARPROJECT_NAME);
- if (earName == null || earName.equals(""))
- {
- if (webProject != null)
- {
-
- IProject[] earProjects = EarUtilities.getReferencingEARProjects(webProject); // required
- // org.eclipse.jem.util
- if (earProjects.length > 0)
- {
- earName = earProjects[0].getName();
- // Since we do have an EAR...
- this.bAddToEAR = true;
- this.sEARProject = earName;
- model.setBooleanProperty(IJAXRSFacetInstallDataModelProperties.ADD_TO_EAR, true);
- model.setStringProperty(IJAXRSFacetInstallDataModelProperties.EARPROJECT_NAME, earName);
- }
- }
- }
- }
-
- String servletName = null;
- if (root != null)
- servletName = root.get(SETTINGS_SERVLET);
- if (servletName == null || servletName.equals("")) { //$NON-NLS-1$
- servletName = (String) model.getDefaultProperty(IJAXRSFacetInstallDataModelProperties.SERVLET_NAME);
- }
- servletInfoGroup.txtJAXRSServletName.setText(servletName);
-
- String servletClassname = null;
- String libraryProviderID = "";
- LibraryInstallDelegate librariesInstallDelegate = (LibraryInstallDelegate) getDataModel().getProperty(LIBRARY_PROVIDER_DELEGATE);
- if (librariesInstallDelegate != null && librariesInstallDelegate.getLibraryProvider() != null)
- libraryProviderID = librariesInstallDelegate.getLibraryProvider().getId();
- if (root != null) {
- servletClassname = root.get(libraryProviderID + SETTINGS_SERVLET_CLASSNAME);
- }
- if (servletClassname == null) {
- servletClassname = JAXRSLibraryProviderUtil.getServletClassName(libraryProviderID);
- if (servletClassname == null)
- servletClassname = (String) model.getDefaultProperty(IJAXRSFacetInstallDataModelProperties.SERVLET_CLASSNAME);
- }
- servletInfoGroup.txtJAXRSServletClassName.setText(servletClassname);
-
- loadURLMappingPatterns(root);
- }
-
- private void saveSettings()
- {
- DialogSettings root = new DialogSettings(IJAXRSUIConstants.SETTINGS_ROOT);
- dialogSettings.addSection(root);
- root.put(SETTINGS_SERVLET, getJAXRSServletName());
- LibraryInstallDelegate librariesInstallDelegate = (LibraryInstallDelegate) getDataModel().getProperty(LIBRARY_PROVIDER_DELEGATE);
- root.put(new String (librariesInstallDelegate.getLibraryProvider().getId() + SETTINGS_SERVLET_CLASSNAME), getJAXRSServletClassname());
- DialogSettings mappings = new DialogSettings(SETTINGS_URL_MAPPINGS);
- root.addSection(mappings);
- mappings.put(SETTINGS_URL_PATTERN, getJAXRSPatterns());
-
- }
-
- private String getJAXRSServletName()
- {
- return servletInfoGroup.txtJAXRSServletName.getText().trim();
- }
-
- private String getJAXRSServletClassname()
- {
- return servletInfoGroup.txtJAXRSServletClassName.getText().trim();
- }
-
- private String[] getJAXRSPatterns()
- {
- return servletInfoGroup.lstJAXRSServletURLPatterns.getItems();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.wst.common.project.facet.ui.IFacetWizardPage#setConfig(java
- * .lang.Object)
- */
- public void setConfig(Object config)
- {
- model.removeListener(this);
- synchHelper.dispose();
-
- model = (IDataModel) config;
- model.addListener(this);
- synchHelper = initializeSynchHelper(model);
- model.setStringProperty(IJAXRSFacetInstallDataModelProperties.EARPROJECT_NAME, sEARProject);
- model.setStringProperty(IJAXRSFacetInstallDataModelProperties.WEBPROJECT_NAME, sWEBProject);
- model.setStringProperty(IJAXRSFacetInstallDataModelProperties.TARGETRUNTIME, sTargetRuntime);
- model.setBooleanProperty(IJAXRSFacetInstallDataModelProperties.ADD_TO_EAR, bAddToEAR);
-
- model.setProperty(IJAXRSFacetInstallDataModelProperties.SERVER_IRUNTIME, targetRuntime);
- model.setProperty(IJAXRSFacetInstallDataModelProperties.CONFIGURATION_PRESET, selectedPreset);
- model.setProperty(IJAXRSFacetInstallDataModelProperties.EARPROJECTS, earProjects);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @seeorg.eclipse.wst.common.project.facet.ui.IFacetWizardPage#
- * transferStateToConfig()
- */
- public void transferStateToConfig()
- {
- saveSettings();
- }
-
- private void addModificationListeners()
- {
-// jaxrsLibCfgComp.setSynchHelper(synchHelper);
- synchHelper.synchText(servletInfoGroup.txtJAXRSServletName, SERVLET_NAME, null);
- synchHelper.synchText(servletInfoGroup.txtJAXRSServletClassName, SERVLET_CLASSNAME, null);
- synchHelper.synchList(servletInfoGroup.lstJAXRSServletURLPatterns, SERVLET_URL_PATTERNS, null);
- synchHelper.synchCheckbox(updateDDCheckBox, UPDATEDD, null);
- }
-
- private void loadURLMappingPatterns(IDialogSettings root)
- {
- servletInfoGroup.lstJAXRSServletURLPatterns.removeAll();
- IDialogSettings mappings = null;
- if (root != null)
- mappings = root.getSection(SETTINGS_URL_MAPPINGS);
- String[] patterns = null;
- if (mappings != null)
- patterns = mappings.getArray(SETTINGS_URL_PATTERN);
-
- if (patterns == null || patterns.length == 0)
- {
- patterns = (String[]) model.getDefaultProperty(IJAXRSFacetInstallDataModelProperties.SERVLET_URL_PATTERNS);
- }
- for (int i = 0; i < patterns.length; i++)
- {
- addItemToList(patterns[i], false);
- }
- }
-
- private void addItemToList(String pattern, boolean selectMe)
- {
- servletInfoGroup.lstJAXRSServletURLPatterns.add(pattern == null ? "" : pattern); //$NON-NLS-1$
- if (pattern == null && selectMe)
- servletInfoGroup.lstJAXRSServletURLPatterns.setSelection(servletInfoGroup.lstJAXRSServletURLPatterns.getItemCount() - 1);
- // When 119321 is fixed - remove code below
- updateModelForURLPattern();
- }
-
- private void removeItemFromList(String[] selection)
- {
- for (int i = 0; i < selection.length; i++)
- {
- String sel = selection[i];
- servletInfoGroup.lstJAXRSServletURLPatterns.remove(sel);
- }
- // When 119321 is fixed - remove code below
- updateModelForURLPattern();
- }
-
- private void updateModelForURLPattern()
- {
- model.setProperty(IJAXRSFacetInstallDataModelProperties.SERVLET_URL_PATTERNS, servletInfoGroup.lstJAXRSServletURLPatterns.getItems());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage
- * #getValidationPropertyNames()
- */
- protected String[] getValidationPropertyNames()
- {
- return new String[] { SERVLET_NAME, SERVLET_CLASSNAME, LIBRARY_PROVIDER_DELEGATE, UPDATEDD };
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.wst.common.project.facet.ui.IFacetWizardPage#setWizardContext
- * (org.eclipse.wst.common.project.facet.ui.IWizardContext)
- */
- @SuppressWarnings("unchecked")
- public void setWizardContext(IWizardContext context) {
- // hook into web datamodel of new project wizard.
- this.context = context;
- sWEBProject = context.getProjectName();
- Iterator it = context.getSelectedProjectFacets().iterator();
- IProjectFacetVersion webFacetVersion = null;
- while (it.hasNext()) {
- // find Web facet
- IProjectFacetVersion pfv = (IProjectFacetVersion) it.next();
- if (pfv.getProjectFacet().getId().equals("jst.web")) { //$NON-NLS-1$
- webFacetVersion = pfv;
- break;
- }
- }
- if (webFacetVersion != null) {
- try {
- webAppDataModel = (IDataModel) context.getConfig(
- webFacetVersion, IFacetedProject.Action.Type.INSTALL,
- context.getProjectName());
- if (webAppDataModel == null) {
- // This means the web facet has already been installed!
- isProjectCreationMode = false;
- IProject webProject = ResourcesPlugin.getWorkspace()
- .getRoot().getProject(sWEBProject);
-
- org.eclipse.wst.common.project.facet.core.runtime.IRuntime rt = ProjectFacetsManager
- .create(webProject).getPrimaryRuntime();
- if (rt != null) {
- IRuntime runtime = FacetUtil.getRuntime(rt);
- if (runtime != null) {
- targetRuntime = runtime;
- IRuntimeType rtType = runtime.getRuntimeType();
- if (rtType != null) {
- sTargetRuntime = rtType.getId();
- }
-
- if (webProject != null) {
- IProject[] referencingEARProjects = EarUtilities
- .getReferencingEARProjects(webProject);
- int size = referencingEARProjects.length;
-
- if (size == 1) {
- String earName = referencingEARProjects[0]
- .getName();
- // Since we do have only one EAR, let's use
- // the existing 'support/variables' and
- // continue as usual
- // The two properties, ADD_TO_EAR and
- // EARPROJECT_NAME will be set.
- this.bAddToEAR = true;
- this.sEARProject = earName;
- } else if (size > 1) {
- // On the other hand, if we have multiple
- // ears, then we need to use the new
- // property EARPROJECTS
- // Perhaps we can just use this new property
- // to handle the case for only one EAR.
- this.bAddToEAR = true;
- this.earProjects = new ArrayList<IProject>();
- String earName = referencingEARProjects[0]
- .getName();
- this.sEARProject = earName;
- for (int i = 0; i < size; i++) {
- earProjects.add(referencingEARProjects[i]);
- }
- }
- }
- }
- }
- } else {
- Object oAddToEAR = webAppDataModel
- .getProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR);
- Object oTargetRuntime = webAppDataModel
- .getProperty(IJ2EEModuleFacetInstallDataModelProperties.FACET_RUNTIME);
- if (oAddToEAR != null) {
- if (((Boolean) oAddToEAR).booleanValue() == true) {
- bAddToEAR = true;
- Object oEARProjectName = webAppDataModel
- .getProperty(IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME);
- if (oEARProjectName != null) {
- this.sEARProject = (String) oEARProjectName;
-
- }
- }
- }
- if (oTargetRuntime != null
- && oTargetRuntime instanceof BridgedRuntime) {
- BridgedRuntime br = (BridgedRuntime) oTargetRuntime;
- if (br != null) {
- IRuntime runtime = FacetUtil.getRuntime(br);
- if (runtime != null) {
- IRuntimeType rtType = runtime.getRuntimeType();
- if (rtType != null)
- sTargetRuntime = rtType.getId();
- }
- }
- }
-
- }
-
- if (webAppDataModel != null) {
- webAppDataModel.addListener(this);
- }
- } catch (CoreException e) {
- JAXRSUIPlugin.log(IStatus.ERROR,
- Messages.JAXRSFacetInstallPage_ErrorNoWebAppDataModel,
- e);
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage
- * #
- * propertyChanged(org.eclipse.wst.common.frameworks.datamodel.DataModelEvent
- * )
- */
- public void propertyChanged(DataModelEvent event)
- {
-
- if (webAppDataModel != null)
- {
- String propertyName = event.getPropertyName();
- if (propertyName.equals(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER))
- {
- model.setStringProperty(WEBCONTENT_DIR, event.getProperty().toString());
- }
- else if (propertyName.equals(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR))
- {
- model.setBooleanProperty(ADD_TO_EAR, ((Boolean) event.getProperty()).booleanValue());
- }
- else if (propertyName.equals(IJ2EEModuleFacetInstallDataModelProperties.FACET_PROJECT_NAME))
- {
- model.setStringProperty(WEBPROJECT_NAME, event.getProperty().toString());
- }
- else if (propertyName.equals(IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME))
- {
- model.setStringProperty(EARPROJECT_NAME, event.getProperty().toString());
- }
- else if (propertyName.equals(IJAXRSFacetInstallDataModelProperties.LIBRARY_PROVIDER_DELEGATE))
- {
- if (event.getProperty() != null) {
-
- LibraryInstallDelegate librariesInstallDelegate = (LibraryInstallDelegate) getDataModel().getProperty(LIBRARY_PROVIDER_DELEGATE);
- String libraryProviderID = librariesInstallDelegate.getLibraryProvider().getId();
- ILibraryProvider thisProvider = librariesInstallDelegate.getLibraryProvider();
- try {
- //we are sometimes notified when the user has not actually changed the selected library type
- if (currentlySelectedLibraryType != thisProvider) {
- //only update servlet class name & update DD state when library
- //type has changed
- currentlySelectedLibraryType = thisProvider;
- updateUpdateDDState(libraryProviderID);
- updateServletClassName(libraryProviderID);
- }
- } catch (Exception e) {
- //TODO exception as we are notified in non-UI thread and Invalid thread access exception,
- //should find another way to get notified when library provider changes
-
- }
-
- }
- }
- }
- super.propertyChanged(event);
- }
-
- private void updateServletClassName(String libraryProviderID) {
- servletInfoGroup.txtJAXRSServletClassName.setText(JAXRSLibraryProviderUtil.getServletClassName(libraryProviderID));
- }
-
-/*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage
- * #dispose()
- */
- public void dispose()
- {
- if (webAppDataModel != null)
- webAppDataModel.removeListener(this);
-
-// jaxrsLibCfgComp.dispose();
- super.dispose();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage
- * #restoreDefaultSettings()
- */
- protected void restoreDefaultSettings()
- {
- initializeValues();
-
-// checkToCompletePage(jaxrsLibCfgComp);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage
- * #showValidationErrorsOnEnter()
- */
- protected boolean showValidationErrorsOnEnter()
- {
- return true;
- }
- @Override
- public boolean isPageComplete()
- {
- final LibraryInstallDelegate librariesInstallDelegate = (LibraryInstallDelegate) getDataModel().getProperty(LIBRARY_PROVIDER_DELEGATE);
- if (librariesInstallDelegate == null)
- throw new IllegalArgumentException("LibraryInstallDelegate is expected to be non-null"); //$NON-NLS-1$
-
- return super.isPageComplete() && (librariesInstallDelegate.validate().getSeverity() != IStatus.ERROR);
- }
-
-
- private void setChildrenEnabled(Composite parentComposite, boolean enabled) {
- Control[] wsdlControls = parentComposite.getChildren();
- for (int i = 0; i < wsdlControls.length; i++) {
- wsdlControls[i].setEnabled(enabled);
- }
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/project/facet/JAXRSLibraryPropertyPage.java b/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/project/facet/JAXRSLibraryPropertyPage.java
deleted file mode 100644
index 5fd8e61..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/project/facet/JAXRSLibraryPropertyPage.java
+++ /dev/null
@@ -1,298 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20091109 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100303 291954 kchong@ca.ibm.com - Keith Chong, JAX-RS: Implement JAX-RS Facet
- * 20100319 306594 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS facet install fails for Web 2.3 & 2.4
- * 20100324 306937 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS Properties page- NPE after pressing OK
- * 20100325 307059 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS properties page- fields empty or incorrect
- * 20100408 308565 kchong@ca.ibm.com - Keith Chong, JAX-RS: Servlet name and class not updated
- * 20100413 307552 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS and Java EE 6 setup is incorrect
- * 20100512 311032 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS Property page- SWT exception when removing facet
- * 20100519 313576 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS tools- validation problems
- * 20100618 307059 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS properties page- fields empty or incorrect
- * 20110617 349715 kchong@ca.ibm.com - Keith Chong, [JAX-RS] Upon selection, the JAX-RS Configuration page is blank when Project Facets page has unapplied changes
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.ui.internal.project.facet;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.common.project.facet.core.libprov.ILibraryProvider;
-import org.eclipse.jst.common.project.facet.core.libprov.LibraryInstallDelegate;
-import org.eclipse.jst.common.project.facet.ui.libprov.LibraryFacetPropertyPage;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.javaee.core.UrlPatternType;
-import org.eclipse.jst.javaee.web.Servlet;
-import org.eclipse.jst.javaee.web.ServletMapping;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.ws.jaxrs.core.internal.IJAXRSCoreConstants;
-import org.eclipse.jst.ws.jaxrs.core.internal.Messages;
-import org.eclipse.jst.ws.jaxrs.core.internal.project.facet.IJAXRSFacetInstallDataModelProperties;
-import org.eclipse.jst.ws.jaxrs.core.internal.project.facet.JAXRSJ2EEUtils;
-import org.eclipse.jst.ws.jaxrs.core.internal.project.facet.JAXRSJEEUtils;
-import org.eclipse.jst.ws.jaxrs.core.internal.project.facet.JAXRSUtils;
-import org.eclipse.jst.ws.jaxrs.ui.internal.IJAXRSUIConstants;
-import org.eclipse.jst.ws.jaxrs.ui.internal.JAXRSUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-@SuppressWarnings("restriction")
-public final class JAXRSLibraryPropertyPage
-
-extends LibraryFacetPropertyPage
-
-implements IJAXRSFacetInstallDataModelProperties
-
-{
-
- private static final String SETTINGS_SERVLET = "servletName"; //$NON-NLS-1$
- private static final String SETTINGS_SERVLET_CLASSNAME = "servletClassname"; //$NON-NLS-1$
- private static final String SETTINGS_URL_MAPPINGS = "urlMappings"; //$NON-NLS-1$
- private static final String SETTINGS_URL_PATTERN = "pattern"; //$NON-NLS-1$
-
- private ServletInformationGroup servletInfoGroup;
-
- private IPath webXMLPath;
- private IModelProvider provider;
- private Object webAppObj;
-
- // J2EE
- private org.eclipse.jst.j2ee.webapplication.Servlet j2eeServlet = null;
- private org.eclipse.jst.j2ee.webapplication.ServletMapping j2eeServletMapping = null;
- private String initialInstallDelegateLibraryProviderID =""; //$NON-NLS-1$
- @Override
- protected Control createPageContents(Composite parent)
- {
- Control c = super.createPageContents(parent);
- LibraryInstallDelegate initialInstallDelegate = super.getLibraryInstallDelegate();
- if ( initialInstallDelegate != null ) {
- ILibraryProvider initialLibraryProvider = initialInstallDelegate.getLibraryProvider();
- if (initialLibraryProvider != null) {
- String initID = initialLibraryProvider.getId();
- initialInstallDelegateLibraryProviderID = (initID == null) ? initialInstallDelegateLibraryProviderID : initID;
- }
- }
- this.webXMLPath = new Path("WEB-INF").append("web.xml"); //$NON-NLS-1$ //$NON-NLS-2$
- this.provider = JAXRSUtils.getModelProvider(getProject());
- if (provider != null)
- this.webAppObj = provider.getModelObject();
- if (doesDDFileExist(getProject(), this.webXMLPath)) {
- servletInfoGroup = new ServletInformationGroup((Composite) c, SWT.NONE);
- servletInfoGroup.txtJAXRSServletName.addListener(SWT.Modify,
- new Listener() {
- public void handleEvent(Event arg0) {
- updateValidation();
- }
- });
- servletInfoGroup.txtJAXRSServletClassName.addListener(SWT.Modify,
- new Listener() {
- public void handleEvent(Event arg0) {
- updateValidation();
- }
- });
- initializeValues();
- }
- return c;
- }
-
- public IProjectFacetVersion getProjectFacetVersion()
- {
- final IProjectFacet jaxrsFacet = ProjectFacetsManager.getProjectFacet(IJAXRSCoreConstants.JAXRS_FACET_ID);
- final IFacetedProject fproj = getFacetedProject();
- return fproj.getInstalledVersion(jaxrsFacet);
- }
-
- @SuppressWarnings({ "unchecked", "rawtypes" })
- protected void initializeValues()
- {
- List<ServletMapping> servletMappings = new ArrayList<ServletMapping>();
- if (webAppObj != null)
- {
- servletInfoGroup.lstJAXRSServletURLPatterns.removeAll();
- //set defaults- in the rare case we do not find the servlet we will create another servlet entry
- String servletName = JAXRSUtils.JAXRS_DEFAULT_SERVLET_NAME;
- String servletClass = JAXRSUtils.JAXRS_SERVLET_CLASS;
- //get id ofthe library provider being used
- LibraryInstallDelegate installDelegate = super.getLibraryInstallDelegate();
- ILibraryProvider libraryProvider = installDelegate.getLibraryProvider();
- String id = "";
- if (libraryProvider != null)
- id = libraryProvider.getId();
- if (JAXRSJEEUtils.isWebApp25or30(webAppObj)) {
- WebApp webApp = (WebApp) webAppObj;
- Servlet servlet = JAXRSJEEUtils.findJAXRSServlet(webApp, id);
- if (servlet != null) {
- servletMappings = webApp.getServletMappings();
- servletName = (servlet.getServletName() == null) ? servletName : servlet.getServletName();
- servletClass =(servlet.getServletClass() == null) ? servletClass : servlet.getServletClass();
- } else {
- //we did not find the servlet entry, set default value
- servletInfoGroup.lstJAXRSServletURLPatterns.add(JAXRSUtils.JAXRS_DEFAULT_URL_MAPPING);
- }
- } else {
- // 2.3 or 2.4 web app
- org.eclipse.jst.j2ee.webapplication.WebApp webApp = (org.eclipse.jst.j2ee.webapplication.WebApp) webAppObj;
- org.eclipse.jst.j2ee.webapplication.Servlet servlet = JAXRSJ2EEUtils
- .findJAXRSServlet(webApp, id);
- if (servlet != null) {
- this.j2eeServlet = servlet;
- servletMappings = webApp.getServletMappings();
- servletName = (servlet.getServletName() == null) ? servletName : servlet.getServletName();
- if (servlet.getServletClass() != null) {
- servletClass =(servlet.getServletClass().getQualifiedName() == null) ? servletClass : servlet.getServletClass().getQualifiedName();
- }
- } else {
- //we did not find the servlet entry, set default value
- servletInfoGroup.lstJAXRSServletURLPatterns.add(JAXRSUtils.JAXRS_DEFAULT_URL_MAPPING);
- }
-
- }
- servletInfoGroup.txtJAXRSServletName.setText(servletName);
- servletInfoGroup.txtJAXRSServletClassName.setText(servletClass);
- // Find the servletMapping that corresponds to the servletName
- if (JAXRSJEEUtils.isWebApp25or30(webAppObj)) {
-
- for (Iterator<ServletMapping> i = servletMappings.iterator(); i.hasNext();)
- {
- Object o = i.next();
- if (o instanceof ServletMapping)
- {
- // init the servletMapping
- ServletMapping next = (ServletMapping) o;
- if (servletName.equals(next.getServletName()))
- {
- for (Iterator p = next.getUrlPatterns().iterator(); p.hasNext();)
- {
- UrlPatternType pattern = (UrlPatternType) p.next();
- servletInfoGroup.lstJAXRSServletURLPatterns.add(pattern.getValue());
- }
- }
- }
- }
- } else {
- for (Iterator<ServletMapping> i = servletMappings.iterator(); i.hasNext();)
- {
- Object o = i.next();
- if (o instanceof org.eclipse.jst.j2ee.webapplication.ServletMapping)
- {
- // init the servletMapping
- org.eclipse.jst.j2ee.webapplication.ServletMapping next = (org.eclipse.jst.j2ee.webapplication.ServletMapping) o;
- org.eclipse.jst.j2ee.webapplication.Servlet aServlet = next.getServlet();
- // the servlet mapping may not have an associated servlet since the user could have modified the file
- if (aServlet != null && servletName.equals(aServlet.getServletName()))
- {
- this.j2eeServletMapping = next;
- String pattern = next.getUrlPattern();
- servletInfoGroup.lstJAXRSServletURLPatterns.add(new String(pattern));
- }
- }
- }
- }
- }
- }
-
- public boolean performOk()
- {
- LibraryInstallDelegate installDelegate = super.getLibraryInstallDelegate();
- if (installDelegate == null)
- //if null user has uninstalled the facet, no reason to update the project properties
- return true;
- ILibraryProvider libraryProvider = installDelegate.getLibraryProvider();
- if (libraryProvider != null) {
- String id = libraryProvider.getId();
- if (!initialInstallDelegateLibraryProviderID.equals(id)
- || IJAXRSUIConstants.USER_LIBRARY_ID.equals(id)) {
- // This will update the libraries by calling the library
- // provider delegate
- super.performOk();
- }
- }
-
- // Update the servlet properties
- if (doesDDFileExist(getProject(), webXMLPath)) {
- createServletAndModifyWebXML(getProject(), null, new NullProgressMonitor());
- }
- return true;
- }
-
- private void createServletAndModifyWebXML(final IProject project, final IDataModel config, final IProgressMonitor monitor)
- {
- List<String> listOfMappings = Arrays.asList(servletInfoGroup.lstJAXRSServletURLPatterns.getItems());
- if (JAXRSJEEUtils.isWebApp25or30(webAppObj))
- {
- provider.modify(new UpdateWebXMLForJavaEE(project, initialInstallDelegateLibraryProviderID , servletInfoGroup.txtJAXRSServletName.getText(), servletInfoGroup.txtJAXRSServletClassName.getText(), listOfMappings),
- IModelProvider.FORCESAVE);
- }
- else
- // must be 2.3 or 2.4
- {
- provider.modify(new UpdateWebXMLForJ2EE(project, this.j2eeServlet, this.j2eeServletMapping, servletInfoGroup.txtJAXRSServletName.getText(), servletInfoGroup.txtJAXRSServletClassName.getText(), listOfMappings), webXMLPath);
- }
- }
-
- private boolean doesDDFileExist(IProject project, IPath webXMLPath)
- {
- return getWebContentPath(project) == null ? false : project.getLocation().append(getWebContentPath(project).lastSegment()).append(webXMLPath).toFile().exists();
- }
- private IPath getWebContentPath(IProject project){
- IVirtualComponent component = ComponentCore.createComponent(project);
- IPath modulePath = component.getRootFolder().getWorkspaceRelativePath();
- return modulePath;
- }
- private IStatus validateServletInfo(String servletName, String ServletClassName) {
- if (servletName == null || servletName.trim().length() == 0) {
- String errorMessage = Messages.JAXRSFacetInstallDataModelProvider_ValidateServletName;
- return createErrorStatus(errorMessage);
- }
- if (ServletClassName == null || ServletClassName.trim().length() == 0) {
- String errorMessage = Messages.JAXRSFacetInstallDataModelProvider_ValidateServletClassName;
- return createErrorStatus(errorMessage);
- }
- return Status.OK_STATUS;
- }
- private IStatus createErrorStatus(String msg) {
- return new Status(IStatus.ERROR, JAXRSUIPlugin.PLUGIN_ID, msg);
- }
- protected IStatus performValidation() {
- IStatus superValidation = super.performValidation();
- if (superValidation.isOK())
- if (doesDDFileExist(getProject(), this.webXMLPath))
- if (servletInfoGroup != null && !servletInfoGroup.isDisposed())
- return validateServletInfo(servletInfoGroup.txtJAXRSServletName.getText(), servletInfoGroup.txtJAXRSServletClassName.getText());
- else
- return Status.OK_STATUS; // superValidation is ok
- else
- return Status.OK_STATUS;
- else {
- return superValidation;
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/project/facet/JAXRSUserLibraryProviderInstallPanel.java b/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/project/facet/JAXRSUserLibraryProviderInstallPanel.java
deleted file mode 100644
index 321bb8b..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/project/facet/JAXRSUserLibraryProviderInstallPanel.java
+++ /dev/null
@@ -1,342 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20100303 291954 kchong@ca.ibm.com - Keith Chong, JAX-RS: Implement JAX-RS Facet
- * 20100310 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
- * 20100319 306595 ericdp@ca.ibm.com - Eric D. Peters, several install scenarios fail for both user library & non-user library
- * 20100324 306937 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS Properties page- NPE after pressing OK
- * 20100407 308401 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS facet wizard page - Shared-library option should be disabled
- * 20100428 310905 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS facet fails to install due to NPE or runtime exception due to duplicate cp entries
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.ui.internal.project.facet;
-
-import org.eclipse.jst.common.project.facet.core.libprov.ILibraryProvider;
-import org.eclipse.jst.common.project.facet.core.libprov.IPropertyChangeListener;
-import org.eclipse.jst.common.project.facet.core.libprov.LibraryInstallDelegate;
-import org.eclipse.jst.common.project.facet.ui.libprov.user.UserLibraryProviderInstallPanel;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryconfig.JAXRSLibraryConfigDialogSettingData;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryconfig.JAXRSLibraryConfigModel;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrslibraryconfig.JAXRSLibraryConfiglModelSource;
-import org.eclipse.jst.ws.jaxrs.core.internal.jaxrssharedlibraryconfig.SharedLibraryConfiguratorUtil;
-import org.eclipse.jst.ws.jaxrs.core.internal.project.facet.IJAXRSFacetInstallDataModelProperties;
-import org.eclipse.jst.ws.jaxrs.core.internal.project.facet.JAXRSUserLibraryProviderInstallOperationConfig;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-
-public class JAXRSUserLibraryProviderInstallPanel extends UserLibraryProviderInstallPanel
-{
- private JAXRSFacetIncludeLibrariesGroup includeLibsGroup;
- private JAXRSLibraryConfigModel workingCopyModel = null;
- private IDataModel model;
- private JAXRSUserLibraryProviderInstallOperationConfig cfg;;
- private ServletInformationGroup servletInfoGroup;
- private boolean sharedLibSupported;
- IDataModelListener listener;
- private ILibraryProvider currentlySelectedLibraryType;
- public JAXRSUserLibraryProviderInstallPanel()
- {
- super();
- }
-
- protected Control createControlNextToManageHyperlink(final Composite composite)
- {
- cfg = (JAXRSUserLibraryProviderInstallOperationConfig) getOperationConfig();
- model = cfg.getModel();
-
-
- Composite mainComp = new Composite(composite, SWT.NONE);
- GridLayout gl = new GridLayout();
- gl.numColumns = 1;
- gl.marginTop = 0;
- gl.marginBottom = 0;
- gl.marginRight = 0;
- gl.marginLeft = 0;
- mainComp.setLayout(gl);
- if (!onPropertiesPage()) {
- String libraryID = ((LibraryInstallDelegate)model.getProperty(IJAXRSFacetInstallDataModelProperties.LIBRARY_PROVIDER_DELEGATE)).getLibraryProvider().getId();
- //listen for all changes in the model- if user changes addToEAR or library type we might need to
- //update the Deploy / Shared Library options
- listener = new IDataModelListener() {
-
- public void propertyChanged(DataModelEvent arg0) {
- DataModelEvent event = arg0;
- if (event == null || event.getPropertyName() == null || (!event.getPropertyName().equals(IJAXRSFacetInstallDataModelProperties.LIBRARY_PROVIDER_DELEGATE) && !event.getPropertyName().equals(IJAXRSFacetInstallDataModelProperties.ADD_TO_EAR) ))
- return;
- LibraryInstallDelegate librariesInstallDelegate = (LibraryInstallDelegate) model
- .getProperty(IJAXRSFacetInstallDataModelProperties.LIBRARY_PROVIDER_DELEGATE);
- ILibraryProvider thisProvider = librariesInstallDelegate
- .getLibraryProvider();
- if (currentlySelectedLibraryType == null)
- currentlySelectedLibraryType = thisProvider;
- else {
- //we are sometimes notified when the user has not actually changed the selected library type
- if (currentlySelectedLibraryType != thisProvider) {
- //only update servlet class name & update DD state when library
- //type has changed
- currentlySelectedLibraryType = thisProvider;
- } else if (!event.getPropertyName().equals(IJAXRSFacetInstallDataModelProperties.ADD_TO_EAR)) {
- return;
- }
- }
- String libraryProviderID = librariesInstallDelegate
- .getLibraryProvider().getId();
- sharedLibSupported = SharedLibraryConfiguratorUtil
- .isSharedLibSupportAvailable(
- libraryProviderID,
- model.getStringProperty(IJAXRSFacetInstallDataModelProperties.TARGETRUNTIME),
- SharedLibraryConfiguratorUtil
- .getWebProject(model),
- SharedLibraryConfiguratorUtil
- .getEARProject(model),
- SharedLibraryConfiguratorUtil
- .getAddToEar(model));
- try {
- model.removeListener(listener);
- initializeControlValues();
- model.addListener(listener);
- } catch (Exception e) {
- //TODO exception as we are notified in non-UI thread and Invalid thread access exception,
- //should find another way to get notified when data model changes
-
- }
-
- }
-
- };
- model.addListener(listener);
- sharedLibSupported = SharedLibraryConfiguratorUtil
- .isSharedLibSupportAvailable(
- libraryID,
- model.getStringProperty(IJAXRSFacetInstallDataModelProperties.TARGETRUNTIME),
- SharedLibraryConfiguratorUtil
- .getWebProject(model),
- SharedLibraryConfiguratorUtil
- .getEARProject(model),
- SharedLibraryConfiguratorUtil
- .getAddToEar(model));
-
-
- //we are in facet install mode
- includeLibsGroup = new JAXRSFacetIncludeLibrariesGroup(mainComp, SWT.NONE);
- includeLibsGroup.getCopyOnPublishCheckBox().setSelection(cfg.isIncludeWithApplicationEnabled());
-
-
-
-
- includeLibsGroup.getCopyOnPublishCheckBox().addSelectionListener(
- new SelectionAdapter() {
- public void widgetSelected(final SelectionEvent event) {
- cfg.setIncludeWithApplicationEnabled(includeLibsGroup
- .getCopyOnPublishCheckBox().getSelection());
- boolean deployLib = false;
- boolean shareLib = false;
- if (includeLibsGroup.getCopyOnPublishCheckBox()
- .getSelection()) {
- deployLib = includeLibsGroup
- .getBtnDeployJars().getSelection();
- shareLib = includeLibsGroup
- .getBtnSharedLibrary().getSelection();
- cfg.setIsDeploy(deployLib);
- cfg.setSharedLibrary(shareLib);
- IDataModel model = cfg.getModel();
- model.setProperty(
- IJAXRSFacetInstallDataModelProperties.DEPLOY_IMPLEMENTATION,
- deployLib);
- model.setProperty(
- IJAXRSFacetInstallDataModelProperties.SHAREDLIBRARY,
- shareLib);
- updateIncludeLibrariesGroupState(shareLib, deployLib, sharedLibSupported);
- } else {
- cfg.setIsDeploy(deployLib);
- cfg.setSharedLibrary(shareLib);
- IDataModel model = cfg.getModel();
- model.setProperty(
- IJAXRSFacetInstallDataModelProperties.DEPLOY_IMPLEMENTATION,
- deployLib);
- model.setProperty(
- IJAXRSFacetInstallDataModelProperties.SHAREDLIBRARY,
- shareLib);
- setChildrenEnabled(includeLibsGroup.getIncludeLibRadiosComposite(), false);
-
- }
-
-
-
- }
- });
-
- includeLibsGroup.getBtnDeployJars().addSelectionListener(
- new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- boolean deployLib = includeLibsGroup.getBtnDeployJars()
- .getSelection();
- boolean shareLib = includeLibsGroup
- .getBtnSharedLibrary().getSelection();
- cfg.setIsDeploy(deployLib);
- cfg.setSharedLibrary(shareLib);
- IDataModel model = cfg.getModel();
- model.setProperty(
- IJAXRSFacetInstallDataModelProperties.DEPLOY_IMPLEMENTATION,
- deployLib);
- model.setProperty(
- IJAXRSFacetInstallDataModelProperties.SHAREDLIBRARY,
- shareLib);
- }
- });
-
- includeLibsGroup.getBtnSharedLibrary().addSelectionListener(
- new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- boolean deployLib = includeLibsGroup.getBtnDeployJars()
- .getSelection();
- boolean shareLib = includeLibsGroup
- .getBtnSharedLibrary().getSelection();
- cfg.setIsDeploy(deployLib);
- cfg.setSharedLibrary(shareLib);
- IDataModel model = cfg.getModel();
- model.setProperty(
- IJAXRSFacetInstallDataModelProperties.DEPLOY_IMPLEMENTATION,
- deployLib);
- model.setProperty(
- IJAXRSFacetInstallDataModelProperties.SHAREDLIBRARY,
- shareLib);
- }
- });
-
- final IPropertyChangeListener listener = new IPropertyChangeListener()
- {
- public void propertyChanged(final String property, final Object oldValue, final Object newValue)
- {
- if (oldValue != newValue)
- {
-// copyOnPublishCheckBox.setSelection(cfg.isIncludeWithApplicationEnabled());
- }
- }
- };
-
- cfg.addListener(listener, JAXRSUserLibraryProviderInstallOperationConfig.PROP_INCLUDE_WITH_APPLICATION_ENABLED);
-
- includeLibsGroup.getCopyOnPublishCheckBox().addDisposeListener(new DisposeListener()
- {
- public void widgetDisposed(final DisposeEvent event)
- {
- cfg.removeListener(listener);
- }
- });
- }
-
- setDownloadCommandEnabled(false);
- initialize();
- return mainComp;
- }
-
- private boolean onPropertiesPage() {
- return cfg.getModel() == null;
- }
-
-
- private void initialize()
- {
- // if shared lib not supported but shared lib setting was true, assume they
- // still want to include libraries
- JAXRSLibraryConfiglModelSource source;
- if (!onPropertiesPage())
- source = new JAXRSLibraryConfigDialogSettingData(includeLibsGroup.getBtnDeployJars().getSelection(), includeLibsGroup.getBtnSharedLibrary().getSelection(), true);
- else
- source = new JAXRSLibraryConfigDialogSettingData(true, false, false);
- if (source != null)
- {
- // never read persistentModel = source;
- workingCopyModel = JAXRSLibraryConfigModel.JAXRSLibraryConfigModelFactory.createInstance(source);
- initializeControlValues();
- }
- }
-
- private void initializeControlValues()
- {
-// btnDeployJars.setSelection(false);
-// btnSharedLibrary.setSelection(false);
-// copyOnPublishCheckBox.setSelection(false);
-
- if (!onPropertiesPage())
- {
- boolean bSharedLib = (Boolean) model
- .getDefaultProperty(IJAXRSFacetInstallDataModelProperties.SHAREDLIBRARY);
- boolean bDeploy = (Boolean) model
- .getDefaultProperty(IJAXRSFacetInstallDataModelProperties.DEPLOY_IMPLEMENTATION);
- if (sharedLibSupported) {
- bSharedLib = SharedLibraryConfiguratorUtil
- .isSharedLibSelectedByDefault(model
- .getStringProperty(IJAXRSFacetInstallDataModelProperties.TARGETRUNTIME));
- if (!bSharedLib)
- bDeploy = true;
- else
- // don't want both to be true, shared lib takes
- // precedence
- bDeploy = false;
-
- }
- // set the properties on the model
- model.setBooleanProperty(
- IJAXRSFacetInstallDataModelProperties.DEPLOY_IMPLEMENTATION,
- bDeploy);
- // set the properties on the configuration object as well
- cfg.setIsDeploy(bDeploy);
- if (sharedLibSupported) {
- cfg.setSharedLibrary(bSharedLib);
- model.setBooleanProperty(
- IJAXRSFacetInstallDataModelProperties.SHAREDLIBRARY,
- bSharedLib);
- }
-
- updateIncludeLibrariesGroupState(bSharedLib, bDeploy, sharedLibSupported);
-
- }
-
-// redraw();
- }
-
- private void updateIncludeLibrariesGroupState(boolean bSharedLib, boolean bDeploy, boolean sharedLibSupported) {
- includeLibsGroup.getCopyOnPublishCheckBox().setEnabled(true);
- includeLibsGroup.getCopyOnPublishCheckBox().setSelection(bDeploy
- || (sharedLibSupported &&bSharedLib));
- updateChildrenState(bSharedLib, bDeploy, sharedLibSupported);
-
- }
-
- private void updateChildrenState(boolean bSharedLib, boolean bDeploy, boolean sharedLibSupported) {
- includeLibsGroup.getBtnDeployJars().setSelection(bDeploy
- || (includeLibsGroup.getCopyOnPublishCheckBox().getSelection() && (!sharedLibSupported || (sharedLibSupported && !bSharedLib))));
- // shared library has precedence
- includeLibsGroup.getBtnSharedLibrary().setSelection(sharedLibSupported
- && bSharedLib);
- includeLibsGroup.getBtnSharedLibrary().setEnabled(includeLibsGroup.getCopyOnPublishCheckBox().getSelection() && sharedLibSupported);
- includeLibsGroup.getBtnDeployJars().setEnabled(includeLibsGroup.getCopyOnPublishCheckBox().getSelection());
-
- }
- public static void setChildrenEnabled(Composite parentComposite, boolean enabled) {
- Control[] wsdlControls = parentComposite.getChildren();
- for (int i=0; i<wsdlControls.length; i++) {
- wsdlControls[i].setEnabled(enabled);
- }
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/project/facet/ServletInformationGroup.java b/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/project/facet/ServletInformationGroup.java
deleted file mode 100644
index d4bb18d..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/project/facet/ServletInformationGroup.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20100303 291954 kchong@ca.ibm.com - Keith Chong, JAX-RS: Implement JAX-RS Facet
- * 20100428 310905 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS facet fails to install due to NPE or runtime exception due to duplicate cp entries
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.ui.internal.project.facet;
-
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.dialogs.IInputValidator;
-import org.eclipse.jface.dialogs.InputDialog;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.ws.jaxrs.core.internal.project.facet.IJAXRSFacetInstallDataModelProperties;
-import org.eclipse.jst.ws.jaxrs.ui.internal.Messages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class ServletInformationGroup extends Composite {
-
- private Group servletInfo;
- private Label lblJAXRSServletName;
- public Text txtJAXRSServletName;
- private Label lblJAXRSServletClassName;
- public Text txtJAXRSServletClassName;
- private Label lblJAXRSServletURLPatterns;
- public List lstJAXRSServletURLPatterns;
- public Button btnAddPattern;
- public Button btnRemovePattern;
-
- private IDataModel optionalModel;
-
- private IDialogSettings dialogSettings;
- private IDataModel webAppDataModel;
- private String sEARProject = null;
- private String sWEBProject = null;
- private String sTargetRuntime = null;
- private boolean bAddToEAR = false;
- private static final String SETTINGS_SERVLET = "servletName"; //$NON-NLS-1$
- private static final String SETTINGS_SERVLET_CLASSNAME = "servletClassname"; //$NON-NLS-1$
- private static final String SETTINGS_URL_MAPPINGS = "urlMappings"; //$NON-NLS-1$
- private static final String SETTINGS_URL_PATTERN = "pattern"; //$NON-NLS-1$
-// private Composite composite = null;
-
- public ServletInformationGroup(Composite parent, int style) {
- super(parent, style);
-
- GridLayout gridLayout = new GridLayout(1, true);
- gridLayout.marginHeight = 0;
- gridLayout.marginWidth = 0;
- gridLayout.verticalSpacing = 0;
- gridLayout.horizontalSpacing = 0;
- setLayout(gridLayout);
- setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- servletInfo = new Group(this, SWT.NONE);
- GridData servletGD = new GridData(GridData.FILL_HORIZONTAL);
- servletInfo.setLayoutData(servletGD);
- servletInfo.setLayout(new GridLayout(3, false));
- servletInfo.setText(Messages.JAXRSFacetInstallPage_JAXRSServletLabel);
-
- lblJAXRSServletName = new Label(servletInfo, SWT.NONE);
- lblJAXRSServletName
- .setText(Messages.JAXRSFacetInstallPage_JAXRSServletNameLabel);
- lblJAXRSServletName.setLayoutData(new GridData(GridData.BEGINNING));
-
- txtJAXRSServletName = new Text(servletInfo, SWT.BORDER);
- GridData gd2 = new GridData(GridData.FILL_HORIZONTAL);
- gd2.horizontalSpan = 2;
- txtJAXRSServletName.setLayoutData(gd2);
-
- lblJAXRSServletClassName = new Label(servletInfo, SWT.NONE);
- lblJAXRSServletClassName
- .setText(Messages.JAXRSFacetInstallPage_JAXRSServletClassNameLabel);
- lblJAXRSServletClassName
- .setLayoutData(new GridData(GridData.BEGINNING));
-
- txtJAXRSServletClassName = new Text(servletInfo, SWT.BORDER);
- GridData gd2c = new GridData(GridData.FILL_HORIZONTAL);
- gd2c.horizontalSpan = 2;
- txtJAXRSServletClassName.setLayoutData(gd2c);
-
- lblJAXRSServletURLPatterns = new Label(servletInfo, SWT.NULL);
- lblJAXRSServletURLPatterns
- .setText(Messages.JAXRSFacetInstallPage_JAXRSURLMappingLabel);
- lblJAXRSServletURLPatterns.setLayoutData(new GridData(
- GridData.BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING));
- lstJAXRSServletURLPatterns = new List(servletInfo, SWT.BORDER);
- GridData gd3 = new GridData(GridData.FILL_BOTH);
-// gd3.heightHint = convertHeightInCharsToPixels(5);
- lstJAXRSServletURLPatterns.setLayoutData(gd3);
- lstJAXRSServletURLPatterns.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- btnRemovePattern.setEnabled(lstJAXRSServletURLPatterns
- .getSelectionCount() > 0);
- }
- });
-
- Composite btnComposite = new Composite(servletInfo, SWT.NONE);
- GridLayout gl = new GridLayout(1, false);
- gl.marginLeft = 0;
- btnComposite.setLayout(gl);
- btnComposite.setLayoutData(new GridData(GridData.END
- | GridData.VERTICAL_ALIGN_FILL));
-
- btnAddPattern = new Button(btnComposite, SWT.NONE);
- btnAddPattern.setText(Messages.JAXRSFacetInstallPage_Add2);
- btnAddPattern.setLayoutData(new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING));
- btnAddPattern.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- InputDialog dialog = new InputDialog(getShell(),
- Messages.JAXRSFacetInstallPage_PatternDialogTitle,
- Messages.JAXRSFacetInstallPage_PatternDialogDesc, null,
- new IInputValidator() {
-
- public String isValid(String newText) {
- return isValidPattern(newText);
- }
-
- });
- dialog.open();
- if (dialog.getReturnCode() == Window.OK) {
- addItemToList(dialog.getValue(), true);
- }
- }
- });
-
- btnRemovePattern = new Button(btnComposite, SWT.NONE);
- btnRemovePattern.setText(Messages.JAXRSFacetInstallPage_Remove);
- btnRemovePattern.setLayoutData(new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING));
- btnRemovePattern.setEnabled(false);
- btnRemovePattern.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- removeItemFromList(lstJAXRSServletURLPatterns.getSelection());
- btnRemovePattern.setEnabled(false);
- }
- });
-
- }
-
-
-
-
- private String isValidPattern(String value) {
- if (value == null || value.trim().equals("")) //$NON-NLS-1$
- return Messages.JAXRSFacetInstallPage_PatternEmptyMsg;
- if (lstJAXRSServletURLPatterns.indexOf(value) >= 0)
- return Messages.JAXRSFacetInstallPage_PatternSpecifiedMsg;
-
- return null;
- }
-
- private void addItemToList(String pattern, boolean selectMe) {
- lstJAXRSServletURLPatterns.add(pattern == null ? "" : pattern); //$NON-NLS-1$
- if (pattern == null && selectMe)
- lstJAXRSServletURLPatterns.setSelection(lstJAXRSServletURLPatterns
- .getItemCount() - 1);
- // When 119321 is fixed - remove code below
- updateModelForURLPattern();
- }
-
- private void updateModelForURLPattern() {
- if (optionalModel != null)
- optionalModel.setProperty(
- IJAXRSFacetInstallDataModelProperties.SERVLET_URL_PATTERNS,
- lstJAXRSServletURLPatterns.getItems());
- }
-
- private void removeItemFromList(String[] selection) {
- for (int i = 0; i < selection.length; i++) {
- String sel = selection[i];
- lstJAXRSServletURLPatterns.remove(sel);
- }
- // When 119321 is fixed - remove code below
- updateModelForURLPattern();
- }
-
-
- public void setDataModel(IDataModel model)
- {
- this.optionalModel = model;
- }
-
-
-
-
- public void setFieldsEnabled(boolean selection) {
- btnAddPattern.setEnabled(selection);
- btnRemovePattern.setEnabled(selection);
- txtJAXRSServletClassName.setEnabled(selection);
- txtJAXRSServletName.setEnabled(selection);
- lblJAXRSServletClassName.setEnabled(selection);
- lblJAXRSServletName.setEnabled(selection);
- lblJAXRSServletURLPatterns.setEnabled(selection);
- lstJAXRSServletURLPatterns.setEnabled(selection);
-
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/project/facet/UpdateWebXMLBase.java b/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/project/facet/UpdateWebXMLBase.java
deleted file mode 100644
index 5f6af64..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/project/facet/UpdateWebXMLBase.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20100303 291954 kchong@ca.ibm.com - Keith Chong, JAX-RS: Implement JAX-RS Facet
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.ui.internal.project.facet;
-
-public abstract class UpdateWebXMLBase implements Runnable {
-
- public abstract void run();
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/project/facet/UpdateWebXMLForJ2EE.java b/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/project/facet/UpdateWebXMLForJ2EE.java
deleted file mode 100644
index bffaaa5..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/project/facet/UpdateWebXMLForJ2EE.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20100303 291954 kchong@ca.ibm.com - Keith Chong, JAX-RS: Implement JAX-RS Facet
- * 20100618 307059 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS properties page- fields empty or incorrect
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.ui.internal.project.facet;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.ServletMapping;
-import org.eclipse.jst.ws.jaxrs.core.internal.project.facet.JAXRSJ2EEUtils;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class UpdateWebXMLForJ2EE extends UpdateWebXMLBase implements Runnable {
- private IProject project;
- private Servlet servlet;
- private ServletMapping servletMapping;
- private String newServletName, newServletClass;
- private List<String> listOfMappings;
-
- public UpdateWebXMLForJ2EE(IProject project, Servlet servlet, ServletMapping servletMapping, String newServletName, String newServletClass, List listOfMappings) {
- this.project = project;
- this.project = project;
- this.servlet = servlet;
- this.servletMapping = servletMapping;
- this.newServletName = newServletName;
- this.newServletClass = newServletClass;
- this.listOfMappings = listOfMappings;
- }
-
- public void run() {
- org.eclipse.jst.j2ee.webapplication.WebApp webApp = (org.eclipse.jst.j2ee.webapplication.WebApp) ModelProviderManager
- .getModelProvider(project).getModelObject();
- //servlet may not exist yet, but will after call below
- servlet = JAXRSJ2EEUtils.createOrUpdateServletRef(webApp, this.newServletName, this.newServletClass, this.servlet);
- JAXRSJ2EEUtils.updateURLMappings(webApp, listOfMappings, servlet);
-
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/project/facet/UpdateWebXMLForJavaEE.java b/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/project/facet/UpdateWebXMLForJavaEE.java
deleted file mode 100644
index 9bff0d5..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.ui/src/org/eclipse/jst/ws/jaxrs/ui/internal/project/facet/UpdateWebXMLForJavaEE.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20100303 291954 kchong@ca.ibm.com - Keith Chong, JAX-RS: Implement JAX-RS Facet
- * 20100408 308565 kchong@ca.ibm.com - Keith Chong, JAX-RS: Servlet name and class not updated
- * 20100618 307059 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS properties page- fields empty or incorrect
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxrs.ui.internal.project.facet;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.javaee.web.Servlet;
-import org.eclipse.jst.javaee.web.ServletMapping;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.ws.jaxrs.core.internal.project.facet.JAXRSJEEUtils;
-
-public class UpdateWebXMLForJavaEE extends UpdateWebXMLBase implements Runnable {
- private IProject project;
- private String newServletName, newServletClass, jaxrsLibraryID;
- private List<String> listOfMappings;
-
-
- /**
- * @deprecated
- * @param project
- * @param servlet
- * @param servletMapping
- * @param newServletName
- * @param newServletClass
- * @param listOfMappings
- */
- public UpdateWebXMLForJavaEE(final IProject project, Servlet servlet, ServletMapping servletMapping, String newServletName, String newServletClass, List<String> listOfMappings) {
- this.project = project;
- this.newServletName = newServletName;
- this.newServletClass = newServletClass;
- this.listOfMappings = listOfMappings;
- }
- /**
- * @deprecated
- */
- public UpdateWebXMLForJavaEE(final IProject project, String newServletName, String newServletClass, List<String> listOfMappings) {
- this.project = project;
- this.newServletName = newServletName;
- this.newServletClass = newServletClass;
- this.listOfMappings = listOfMappings;
-
- }
- public UpdateWebXMLForJavaEE(final IProject project, String jaxrsLibraryID, String newServletName, String newServletClass, List<String> listOfMappings) {
- this.project = project;
- this.newServletName = newServletName;
- this.newServletClass = newServletClass;
- this.listOfMappings = listOfMappings;
- this.jaxrsLibraryID = jaxrsLibraryID;
- }
-
- public void run() {
- WebApp webApp = (WebApp) ModelProviderManager.getModelProvider(project).getModelObject();
- Servlet servlet;
- servlet = JAXRSJEEUtils.findJAXRSServlet(webApp, jaxrsLibraryID);
- //servlet may not exist yet, but will after call below
- servlet = JAXRSJEEUtils.createOrUpdateServletRef(webApp, this.newServletName, this.newServletClass, servlet);
- JAXRSJEEUtils.updateURLMappings(webApp, listOfMappings, servlet);
- }
-}
