This commit was manufactured by cvs2svn to create branch 'R3_2_5_1_patches'.
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 35ec29e..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.550.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 d748a6d..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,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2012 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * 20120409 376345 yenlu@ca.ibm.com, kchong@ca.ibm.com - Stability improvements to web services commands/operations
- *******************************************************************************/
-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.jst.ws.internal.axis.consumption.ui.plugin.WebServiceAxisConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-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 clientOperation = new ClientWSModifyOperation(info, env);
- try {
- clientOperation.run(monitor);
-
- //project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, monitor);
- BuildProjectCommand buildCommand = new BuildProjectCommand();
- buildCommand.setProject(project);
- buildCommand.setEnvironment(env);
- buildCommand.setForceBuild(true);
- buildCommand.execute(monitor, info);
-
- GenProxyBeanOperation genProxyBeanOperation = new GenProxyBeanOperation(info, env);
- genProxyBeanOperation.run(monitor);
-
- }
- catch(Exception e){
- IStatus status = new Status(IStatus.ERROR, WebServiceAxisConsumptionUIPlugin.ID, e.getMessage(), e);
- return status;
- }
- return Status.OK_STATUS;
-
- }
-
- private class GenProxyBeanOperation extends WorkspaceModifyOperation
- {
- private IAdaptable info = null;
- private IEnvironment env = null;
-
- protected GenProxyBeanOperation(IAdaptable adaptable, IEnvironment environment)
- {
- //super(project);
- info = adaptable;
- env = environment;
- }
-
- protected void execute(IProgressMonitor monitor) throws CoreException
- {
- // Stub2BeanCommand
- stub2BeanCommand.setEnvironment(env);
- stub2BeanCommand.setWebServicesParser(webServicesParser);
- stub2BeanCommand.setOutputFolder(outputFolder);
- stub2BeanCommand.setJavaWSDLParam(javaWSDLParam);
- stub2BeanCommand.setClientProject(project);
- IStatus status = stub2BeanCommand.execute(monitor, info);
- if (status.getSeverity() == Status.ERROR) {
- throw new CoreException(status);
- }
- proxyBean = stub2BeanCommand.getProxyBean();
- proxyEndpoint = stub2BeanCommand.getProxyEndpoint();
- }
- }
-
- 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);
- }
-
- // 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 666157e..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.650.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 6eb7894..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,195 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2012 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * 20120409 376345 yenlu@ca.ibm.com, kchong@ca.ibm.com - Stability improvements to web services commands/operations
- *******************************************************************************/
-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.plugin.WebServiceAxisCreationUIPlugin;
-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.run(monitor);
- }
- catch (Exception e)
- {
- IStatus status = new Status(IStatus.ERROR, WebServiceAxisCreationUIPlugin.ID, e.getMessage(), e);
- 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 7b0a0c5..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,276 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2012 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * 20120409 376345 yenlu@ca.ibm.com, kchong@ca.ibm.com - Stability improvements to web services commands/operations
- *******************************************************************************/
-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.plugin.WebServiceAxisCreationUIPlugin;
-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.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-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.run(monitor);
-
- //serverProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD,monitor);
- BuildProjectCommand buildCommand = new BuildProjectCommand();
- buildCommand.setProject(serverProject);
- buildCommand.setEnvironment(env);
- buildCommand.setForceBuild(true);
- buildCommand.execute(monitor, info);
-
- GenSkeletonAndUpdateDDOperation genSkeletonAndUpdateDDOperation = new GenSkeletonAndUpdateDDOperation(info, env);
- genSkeletonAndUpdateDDOperation.run(monitor);
- }
- catch(Exception e){
- IStatus status = new Status(IStatus.ERROR, WebServiceAxisCreationUIPlugin.ID, e.getMessage(), e);
- return status;
- }
- return Status.OK_STATUS;
- }
-
- private class GenSkeletonAndUpdateDDOperation extends WorkspaceModifyOperation
- {
- private IAdaptable info = null;
- private IEnvironment env = null;
-
- protected GenSkeletonAndUpdateDDOperation(IAdaptable adaptable, IEnvironment environment)
- {
- //super(serverProject);
- info = adaptable;
- env = environment;
- }
-
- @Override
- protected void execute(IProgressMonitor monitor) throws CoreException
- {
- // Skeleton2WSDLCommand
- skeleton2WSDLCommand.setEnvironment(env);
- skeleton2WSDLCommand.setWebServicesParser(webServicesParser);
- skeleton2WSDLCommand.setJavaWSDLParam(javaWSDLParam);
- skeleton2WSDLCommand.setServerProject(serverProject);
- skeleton2WSDLCommand.setServiceServerTypeID(serviceServerTypeID);
- skeleton2WSDLCommand.setServiceExistingServer(serviceExistingServer);
- IStatus 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);
- }
-
- }
- }
-
- private class TopDownWSModifyOperation extends WorkspaceModifyOperation {
-
- private IAdaptable info = null;
- private IEnvironment env = null;
-
- protected TopDownWSModifyOperation(IAdaptable adaptable, IEnvironment environment){
- //super(serverProject);
- 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();
- }
-
- }
-
-
-
- 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 926a61e..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,296 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * 20120409 376345 yenlu@ca.ibm.com, kchong@ca.ibm.com - Stability improvements to web services commands/operations
- *******************************************************************************/
-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.IWorkspace;
-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, serverProject, IWorkspace.AVOID_UPDATE, 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.consumption.ui/.classpath b/bundles/org.eclipse.jst.ws.consumption.ui/.classpath
deleted file mode 100644
index 196d49a..0000000
--- a/bundles/org.eclipse.jst.ws.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.consumption.ui/.cvsignore b/bundles/org.eclipse.jst.ws.consumption.ui/.cvsignore
deleted file mode 100644
index 29c079c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-bin
-build.xml
-temp.folder
-wsc-ui.jar
-@dot
-src.zip
-javaCompiler...args
-org.eclipse.jst.ws.consumption.ui_*.jar
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/.project b/bundles/org.eclipse.jst.ws.consumption.ui/.project
deleted file mode 100644
index e102604..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.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.consumption.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.consumption.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2f402ee..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Mon Nov 19 13:59:56 EST 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.consumption.ui/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.jst.ws.consumption.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index e53eddf..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 30 10:41:20 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.consumption.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 43e6238..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,79 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.consumption.ui; singleton:=true
-Bundle-Version: 1.1.350.qualifier
-Bundle-Activator: org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.consumption.ui;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.ant;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.command;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.command.data;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.common;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.extension;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.plugin;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.preferences;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.selection;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.server;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.widgets;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.binding;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.object;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.test;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.test.explorer;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.wizard;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.wsil;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.wsrt;x-internal:=true
-Import-Package: com.ibm.icu.util; version="3.8",
- com.ibm.icu.text; version="3.8"
-Require-Bundle: org.apache.xerces;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.wst.ws.parser;bundle-version="[1.0.100,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.command.env.core;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,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.ui;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.jst.ws.consumption;bundle-version="[1.0.101,1.1.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.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.jdt.ui;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.wst.ws;bundle-version="[1.0.100,1.2.0)",
- org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.wst.server.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.wst.server.ui;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.jst.j2ee.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.jst.j2ee.ejb;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.web;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.emf;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.jst.j2ee.webservice;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.webservice.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.wst.ws.ui;bundle-version="[1.1.0,1.2.0)",
- javax.wsdl;bundle-version="[1.5.0,1.6.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.wst.wsdl.validation;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.frameworks.ui;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.jst.server.core;bundle-version="[1.0.102,2.0.0)",
- org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.forms;bundle-version="[3.2.0,4.0.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/about.html b/bundles/org.eclipse.jst.ws.consumption.ui/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/bundles/org.eclipse.jst.ws.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.consumption.ui/build.properties b/bundles/org.eclipse.jst.ws.consumption.ui/build.properties
deleted file mode 100644
index ffb8cb2..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-bin.includes = .,\
- icons/,\
- plugin.properties,\
- plugin.xml,\
- META-INF/,\
- about.html
-src.includes = schema/
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/client_assemble.jpg b/bundles/org.eclipse.jst.ws.consumption.ui/icons/client_assemble.jpg
deleted file mode 100644
index e676679..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/client_assemble.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/client_deploy.jpg b/bundles/org.eclipse.jst.ws.consumption.ui/icons/client_deploy.jpg
deleted file mode 100644
index 7cfc866..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/client_deploy.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/client_develop.jpg b/bundles/org.eclipse.jst.ws.consumption.ui/icons/client_develop.jpg
deleted file mode 100644
index d659e24..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/client_develop.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/client_install.jpg b/bundles/org.eclipse.jst.ws.consumption.ui/icons/client_install.jpg
deleted file mode 100644
index 0822508..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/client_install.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/client_none.jpg b/bundles/org.eclipse.jst.ws.consumption.ui/icons/client_none.jpg
deleted file mode 100644
index 91c8fa9..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/client_none.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/client_run.jpg b/bundles/org.eclipse.jst.ws.consumption.ui/icons/client_run.jpg
deleted file mode 100644
index 363ac70..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/client_run.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/client_test.jpg b/bundles/org.eclipse.jst.ws.consumption.ui/icons/client_test.jpg
deleted file mode 100644
index 36b9445..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/client_test.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/configure_handlers.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/configure_handlers.gif
deleted file mode 100644
index a113c85..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/configure_handlers.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/generated_sample.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/generated_sample.gif
deleted file mode 100644
index eaba51f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/generated_sample.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/newclient_webserv_wiz.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/newclient_webserv_wiz.gif
deleted file mode 100644
index 1ee05fa..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/newclient_webserv_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/configure_handlers.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/configure_handlers.gif
deleted file mode 100644
index 1060dd9..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/configure_handlers.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/generated_sample.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/generated_sample.gif
deleted file mode 100644
index 590d396..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/generated_sample.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/config_handler_wiz.png b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/config_handler_wiz.png
deleted file mode 100644
index 8b1189b..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/config_handler_wiz.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/gen_sample_wiz.png b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/gen_sample_wiz.png
deleted file mode 100644
index 0ebafc9..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/gen_sample_wiz.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/import-wsil_wiz.png b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/import-wsil_wiz.png
deleted file mode 100644
index a69bdb2..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/import-wsil_wiz.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/import_ws_wiz.png b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/import_ws_wiz.png
deleted file mode 100644
index ac78ee6..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/import_ws_wiz.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/webservicesclient_wiz.png b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/webservicesclient_wiz.png
deleted file mode 100644
index 7d2335b..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/webservicesclient_wiz.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/import_ws.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/import_ws.gif
deleted file mode 100644
index 641fe84..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/import_ws.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/registry.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/registry.gif
deleted file mode 100644
index 5b43cae..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/registry.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale0_bground.jpg b/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale0_bground.jpg
deleted file mode 100644
index 4da5ca0..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale0_bground.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale1_bground.jpg b/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale1_bground.jpg
deleted file mode 100644
index df1207d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale1_bground.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale2_bground.jpg b/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale2_bground.jpg
deleted file mode 100644
index 9741fde..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale2_bground.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale3_bground.jpg b/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale3_bground.jpg
deleted file mode 100644
index 35d4e22..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale3_bground.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale4_bground.jpg b/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale4_bground.jpg
deleted file mode 100644
index 82bbd5c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale4_bground.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale5_bground.jpg b/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale5_bground.jpg
deleted file mode 100644
index b0806f7..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale5_bground.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale6_bground.jpg b/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale6_bground.jpg
deleted file mode 100644
index 818bcff..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale6_bground.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/existing_server_obj.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/existing_server_obj.gif
deleted file mode 100644
index afb6cb7..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/existing_server_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/servers_obj.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/servers_obj.gif
deleted file mode 100644
index afb6cb7..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/servers_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/html.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/html.gif
deleted file mode 100644
index 53e7dbd..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/html.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/import_wsil.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/import_wsil.gif
deleted file mode 100644
index 618a946..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/import_wsil.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsdl.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsdl.gif
deleted file mode 100644
index 8fb844f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsdl.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsil.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsil.gif
deleted file mode 100644
index 7c5916f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsil.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/plugin.properties b/bundles/org.eclipse.jst.ws.consumption.ui/plugin.properties
deleted file mode 100644
index f58d8e6..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/plugin.properties
+++ /dev/null
@@ -1,130 +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
-# yyyymmdd bug Email and other contact information
-# -------- -------- -----------------------------------------------------------
-# 20060515 141536 pmoogk@ca.ibm.com - Peter Moogk
-# 20070820 191585 pmoogk@ca.ibm.com - Peter Moogk
-# 20070917 202303 pmoogk@ca.ibm.com - Peter Moogk
-# 20080325 184761 gilberta@ca.ibm.com - Gilbert Andrews
-# 20090909 244814 mahutch@ca.ibm.com - Mark Hutchinson
-# 20100811 322429 mahutch@ca.ibm.com - Mark Hutchinson, Improve performance of launching the Web Services Wizard
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services Consumption Graphical User Interface
-PLUGIN_PROVIDER=Eclipse Web Tools Platform
-
-FEATURE_DESCRIPTION=Web services
-WEBSERVICES_CATEGORY=Web services
-
-XP_wsImpl=Web service implementations
-XP_wsClientImpl=Web service client implementations
-XP_runtimes=Web service runtimes
-XP_serviceRuntimes=Combination of a Web service runime, service implementation type, and required facets
-XP_clientRuntimes=Combination of a Web service runime, client implementation type, and required facets
-XP_tester=Web service test facilities
-
-XP_serviceRuntimesProperties=Web service runtime properties
-XP_clientRuntimesProperties=Client runtime properties
-
-XP_PUBLIC_UDDI_REGISTRY_TYPES=Public UDDI Registry Types
-XP_PRIVATE_UDDI_REGISTRY_TYPES=Private UDDI Registry Types
-XP_WEB_SERVICE_CLIENT_TYPES=Web Service Client Types
-XP_WEB_SERVICE_TEST=Web Service Test
-XP_WEB_SERVICE_SERVER_RUNTIME_TYPES=Web Service Server Runtime Types
-XP_WEB_SERVICE_CLIENT_PROJECT_TYPE=clientProjectType
-XP_OBJECT_SELECTION_WIDGET=objectSelectionWidget
-
-#
-# Wizards.
-#
-WIZARD_TITLE_WSC=Web Service Client
-
-PLUGIN_NEW_WIZARD_NAME_WS_CLIENT=Web Service Client
-PLUGIN_IMPORT_WIZARD_NAME_WS=Web Service
-PLUGIN_NEW_WIZARD_DESC_WS_CLIENT=Access an existing XML web service
-PLUGIN_IMPORT_WIZARD_DESC_WS=A wizard for importing a web service
-IMPORT_WIZARD_DESC_WSIL=Import WSDL references to a WSIL document
-
-#
-# Web Samples IDs
-#
-SAMPLE_TYPE_WEBSERVICES_ID=JAX-RPC JSPs
-
-#
-# Pop-up actions
-#
-ACTION_GENERATE_JAVA_PROXY=Generate Client
-ACTION_GEN_SAMPLE=Generate JAX-RPC JSPs
-
-#
-# Dialogs
-#
-CHECKBOX_SHOW_GENERATE_JAVA_PROXY_DIALOG=Hide &Generate Java bean Proxy Dialog
-CHECKBOX_SHOW_PROXY2SAMPLE_DIALOG=Hide &Proxy To Sample Generation Dialog
-TOOLTIP_PPAD_CHECKBOX_WSDL2PROXY=Hide the dialog for generating the Java bean proxy action.
-TOOLTIP_PPAD_CHECKBOX_PROXY2SAMPLE=Hide the dialog for generating the sample application action.
-
-#
-# Web Services Preferance Pages
-#
-# Categories
-
-PREFERENCE_CATEGORY_SERVER_RUNTIME=Server and Runtime
-PREFERENCE_CATEGORY_PROJECT_TOPOLOGY=Project Topology
-PREFERENCE_CATEGORY_TEST_FACILITY=Test Facility Defaults
-PREFERENCE_CATEGORY_DIALOGS=Popup Dialog Selection
-
-
-#
-# WebServiceTestPage
-#
-WSEXPLORER_ID=Web Services Explorer
-
-#
-# PublicUDDIRegistryType
-#
-PUBLICUDDIREGISTRYTYPE_NAME_SAP=SAP UDDI Registry
-PUBLICUDDIREGISTRYTYPE_NAME_SAP_TEST=SAP UDDI Test Registry
-PUBLICUDDIREGISTRYTYPE_NAME_XMETHODS=XMethods Registry
-PUBLICUDDIREGISTRYTYPE_NAME_NTTCOMM=NTT Communications Registry
-
-#
-# WSIL proxy
-#
-IMPORT_WIZARD_NAME_WSIL=WSIL
-POPUP_GENERATE_WSIL=Generate WSIL
-
-#
-# Web Service Server Runtime Type
-#
-WEBSERVICETYPE_NAME_WSDL=Skeleton Java bean Web Service
-WEBSERVICETYPE_NAME_JAVA=Java bean Web Service
-
-#
-# Web service client implementation type
-#
-JAVA_PROXY=Java Proxy
-#
-# Client project type
-#
-LABEL_CLIENT_TYPE_WEB=Web
-LABEL_CLIENT_TYPE_EJB=EJB
-LABEL_CLIENT_TYPE_APP_CLIENT=Application Client
-LABEL_CLIENT_TYPE_CONTAINERLESS=Java
-
-#
-# Handlers Configuration wizard page
-#
-POPUP_ADD_HANDLERS=Configure Handlers
-POPUP_CONFIG_CLIENT_HANDLERS=Configure Client Handlers
-LABEL_HANDLERS_CONFIG=Configure Handlers
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/plugin.xml b/bundles/org.eclipse.jst.ws.consumption.ui/plugin.xml
deleted file mode 100644
index b60972d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/plugin.xml
+++ /dev/null
@@ -1,774 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
- <!-- The following extension point is internal and likely to be removed in a future release. -->
- <extension-point
- id="publicUDDIRegistryType"
- name="%XP_PUBLIC_UDDI_REGISTRY_TYPES"/>
-
- <!-- The following extension point is internal and likely to be removed in a future release. -->
- <extension-point
- id="privateUDDIRegistryType"
- name="%XP_PRIVATE_UDDI_REGISTRY_TYPES"/>
-
- <!-- The following extension point is internal and likely to be removed in a future release. -->
- <extension-point
- id="webServiceTest"
- name="%XP_WEB_SERVICE_TEST"
- schema="schema/webServiceTest.exsd"/>
-
- <!-- The following extension point is internal, though likely to be made public with changes in a future release. -->
- <extension-point
- id="objectSelectionWidget"
- name="%XP_OBJECT_SELECTION_WIDGET"
- schema="schema/objectSelectionWidget.exsd"/>
-
- <!-- UDDI Registry Types -->
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.publicUDDIRegistryType">
- <publicUDDIRegistryType
- name="%PUBLICUDDIREGISTRYTYPE_NAME_SAP_TEST"
- class="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistrySAPTest"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistrySAPTest">
- </publicUDDIRegistryType>
- </extension>
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.publicUDDIRegistryType">
- <publicUDDIRegistryType
- name="%PUBLICUDDIREGISTRYTYPE_NAME_SAP"
- class="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistrySAP"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistrySAP">
- </publicUDDIRegistryType>
- </extension>
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.publicUDDIRegistryType">
- <publicUDDIRegistryType
- name="%PUBLICUDDIREGISTRYTYPE_NAME_XMETHODS"
- class="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryXMethods"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryXMethods">
- </publicUDDIRegistryType>
- </extension>
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.publicUDDIRegistryType">
- <publicUDDIRegistryType
- name="%PUBLICUDDIREGISTRYTYPE_NAME_NTTCOMM"
- class="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryNTTComm"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryNTTComm">
- </publicUDDIRegistryType>
- </extension>
-
- <!-- Test Facilities -->
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.webServiceTest">
-
- <webServiceTest
- methodsneeded="true"
- name="%SAMPLE_TYPE_WEBSERVICES_ID"
- java="true"
- codegen="true"
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample.WebServiceWSSampleExecutable"
- id="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WebServiceSampleTest">
- </webServiceTest>
-
- <webServiceTest
- methodsneeded="false"
- name="%WSEXPLORER_ID"
- java="false"
- codegen="false"
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.explorer.WebServiceExplorerExecutable"
- id="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.explorer.WebServiceExplorerExecutable">
- </webServiceTest>
-
- </extension>
-
- <!-- Dynamic Wizards -->
-
- <extension
- point="org.eclipse.ui.newWizards">
- <wizard
- name="%PLUGIN_NEW_WIZARD_NAME_WS_CLIENT"
- icon="icons/full/ctool16/newclient_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.internal.consumption.ui.wizard.client.clientwizard">
- <description>
- %PLUGIN_NEW_WIZARD_DESC_WS_CLIENT
- </description>
- <selection
- class="org.eclipse.core.resources.IResource">
- </selection>
- </wizard>
- </extension>
-
- <extension
- point="org.eclipse.wst.command.env.dynamicWizard">
- <dynamicWizard
- iconbanner="icons/full/wizban/webservicesclient_wiz.png"
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.binding.ClientWidgetBinding"
- title="%WIZARD_TITLE_WSC"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
- </dynamicWizard>
- </extension>
-
- <extension
- point="org.eclipse.wst.command.env.dynamicWizard">
- <dynamicWizard
- iconbanner="icons/full/wizban/gen_sample_wiz.png"
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.binding.GenSampleWidgetBinding"
- title="%WIZARD_TITLE_WSC"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.gensamplewizard">
- </dynamicWizard>
- </extension>
-
- <!-- Handler extensions -->
- <extension
- point="org.eclipse.wst.command.env.dynamicWizard">
- <dynamicWizard
- iconbanner="icons/full/wizban/config_handler_wiz.png"
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.binding.ConfigServiceHandlersWidgetBinding"
- title="%LABEL_HANDLERS_CONFIG"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.service">
- </dynamicWizard>
- </extension>
-
- <extension
- point="org.eclipse.wst.command.env.dynamicWizard">
- <dynamicWizard
- iconbanner="icons/full/wizban/config_handler_wiz.png"
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.binding.ConfigClientHandlersWidgetBinding"
- title="%LABEL_HANDLERS_CONFIG"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.client">
- </dynamicWizard>
- </extension>
-
- <extension
- point="org.eclipse.wst.command.env.dynamicWizard">
- <dynamicWizard
- iconbanner="icons/full/wizban/config_handler_wiz.png"
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.binding.ConfigureHandlersWidgetBinding"
- title="%LABEL_HANDLERS_CONFIG"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers">
- </dynamicWizard>
- </extension>
-
- <extension
- point="org.eclipse.ui.importWizards">
- <category
- id="org.eclipse.jst.ws.consumption.ui.wsimport.category"
- name="%WEBSERVICES_CATEGORY"/>
- </extension>
-
- <extension
- point="org.eclipse.ui.importWizards">
- <wizard
- name="%PLUGIN_IMPORT_WIZARD_NAME_WS"
- icon="icons/import_ws.gif"
- category="org.eclipse.jst.ws.consumption.ui.wsimport.category"
- class="org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard"
- id="org.eclipse.jst.ws.consumption.ui.wsimport">
- <description>
- %PLUGIN_IMPORT_WIZARD_DESC_WS
- </description>
- </wizard>
- </extension>
-
- <extension
- point="org.eclipse.wst.command.env.dynamicWizard">
- <dynamicWizard
- iconbanner="icons/full/wizban/import_ws_wiz.png"
- name="%PLUGIN_IMPORT_WIZARD_NAME_WS"
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.binding.ImportWSWidgetBinding"
- id="org.eclipse.jst.ws.consumption.ui.wsimport">
- </dynamicWizard>
- </extension>
-
- <extension
- point="org.eclipse.ui.importWizards">
- <wizard
- name="%IMPORT_WIZARD_NAME_WSIL"
- icon="icons/wsil/import_wsil.gif"
- category="org.eclipse.jst.ws.consumption.ui.wsimport.category"
- class="org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard"
- id="org.eclipse.jst.ws.consumption.ui.wsilimport">
- <description>
- %IMPORT_WIZARD_DESC_WSIL
- </description>
- </wizard>
- </extension>
-
- <extension
- point="org.eclipse.wst.command.env.dynamicWizard">
- <dynamicWizard
- iconbanner="icons/full/wizban/import-wsil_wiz.png"
- name="%IMPORT_WIZARD_NAME_WSIL"
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.binding.ImportWSILWidgetBinding"
- id="org.eclipse.jst.ws.consumption.ui.wsilimport">
- </dynamicWizard>
- </extension>
-
- <!-- Preference Pages -->
-
- <extension
- point="org.eclipse.ui.preferencePages">
-
- <page
- name="%PREFERENCE_CATEGORY_SERVER_RUNTIME"
- category="org.eclipse.wst.ws.internal.ui.preferences.name"
- class="org.eclipse.jst.ws.internal.consumption.ui.preferences.ServerRuntimePreferencePage"
- id="org.eclipse.jst.ws.internal.consumption.ui.preferences.ServerRuntimePreferencePage">
- </page>
-
- <page
- name="%PREFERENCE_CATEGORY_DIALOGS"
- category="org.eclipse.wst.ws.internal.ui.preferences.name"
- class="org.eclipse.wst.command.internal.env.ui.preferences.ActionDialogsPreferencePage"
- id="org.eclipse.jst.wss.popup.category">
- </page>
-
- <page
- name="%PREFERENCE_CATEGORY_TEST_FACILITY"
- category="org.eclipse.wst.ws.internal.ui.preferences.name"
- class="org.eclipse.jst.ws.internal.ui.preferences.TestFacilityDefaultsPreferencePage"
- id="org.eclipse.jst.ws.internal.ui.preferences.TestFacilityDefaultsPreferencePage">
- </page>
-
- <page
- name="%PREFERENCE_CATEGORY_PROJECT_TOPOLOGY"
- category="org.eclipse.wst.ws.internal.ui.preferences.name"
- class="org.eclipse.jst.ws.internal.consumption.ui.preferences.ProjectTopologyPreferencePage"
- id="org.eclipse.jst.ws.internal.consumption.ui.preferences.ProjectTopologyPreferencePage">
- </page>
-
- </extension>
-
-
- <!-- "Don't Show Me" Extensions -->
-
- <extension
- point="org.eclipse.wst.command.env.actionDialogPreferenceType">
-
- <actionDialogPreferenceType
- showcheckbox="true"
- name="%CHECKBOX_SHOW_GENERATE_JAVA_PROXY_DIALOG"
- category="org.eclipse.jst.wss.popup.category"
- tooltip="%TOOLTIP_PPAD_CHECKBOX_WSDL2PROXY"
- infopop="org.eclipse.jst.ws.consumption.ui.PPAD0004"
- alwayshide="false"
- objectids="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard.wsdl org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard.wsil org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard.service org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard.wsdl.resource org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard.serviceref"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
- </actionDialogPreferenceType>
-
- <actionDialogPreferenceType
- name="%CHECKBOX_SHOW_PROXY2SAMPLE_DIALOG"
- category="org.eclipse.jst.wss.popup.category"
- tooltip="%TOOLTIP_PPAD_CHECKBOX_PROXY2SAMPLE"
- infopop="org.eclipse.jst.ws.consumption.ui.PPAD0005"
- objectids="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.gensamplewizard.file org.eclipse.jst.ws.internal.consumption.ui.wizard.client.gensamplewizard.java"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.gensamplewizard">
- </actionDialogPreferenceType>
-
- <actionDialogPreferenceType
- showcheckbox="false"
- alwayshide="false"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.genwsil">
- </actionDialogPreferenceType>
-
- <!-- actionDialogPreferenceType
- showcheckbox="false"
- alwayshide="false"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
- </actionDialogPreferenceType -->
-
- </extension>
-
- <!-- Popups -->
-
- <extension
- point="org.eclipse.ui.popupMenus">
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.wsdl"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.genwsil">
- <action
- label="%POPUP_GENERATE_WSIL"
- 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.consumption.ui.wsilimport">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.wsdl"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard.wsdl">
- <action
- label="%ACTION_GENERATE_JAVA_PROXY"
- 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.internal.consumption.ui.wizard.client.clientwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.wsil"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard.wsil">
- <action
- label="%ACTION_GENERATE_JAVA_PROXY"
- 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.internal.consumption.ui.wizard.client.clientwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.java"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.gensamplewizard.file">
- <action
- label="%ACTION_GEN_SAMPLE"
- 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.internal.consumption.ui.wizard.client.gensamplewizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.jdt.internal.core.CompilationUnit"
- nameFilter="*.java"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.gensamplewizard.java">
- <action
- label="%ACTION_GEN_SAMPLE"
- 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.internal.consumption.ui.wizard.client.gensamplewizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.wst.wsdl.Service"
- nameFilter="*"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard.service">
- <action
- label="%ACTION_GENERATE_JAVA_PROXY"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.wst.wsdl.Service"
- nameFilter="*"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.genwsil.service">
- <action
- label="%POPUP_GENERATE_WSIL"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.consumption.ui.wsilimport">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="webservices.xml"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor.file">
- <action
- label="%POPUP_ADD_HANDLERS"
- 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.internal.consumption.ui.wizard.handlers.service">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.wst.wsdl.Service"
- nameFilter="*"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor.service"
- adaptable="true">
- <action
- label="%POPUP_ADD_HANDLERS"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.service">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroupType"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor.navGroup">
- <action
- label="%POPUP_ADD_HANDLERS"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers">
- </action>
- <visibility>
- <objectState
- name="type"
- value="Handlers">
- </objectState>
- </visibility>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.wst.wsdl.util.WSDLResourceImpl"
- nameFilter="*"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor.wsdlRes">
- <action
- label="%POPUP_ADD_HANDLERS"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.service">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="webservicesclient.xml"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor.xmlfile">
- <action
- label="%POPUP_CONFIG_CLIENT_HANDLERS"
- 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.internal.consumption.ui.wizard.handlers.client">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="ejb-jar.xml"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor.ejbfile">
- <action
- label="%POPUP_CONFIG_CLIENT_HANDLERS"
- 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.internal.consumption.ui.wizard.handlers.client">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="web.xml"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor.webfile">
- <action
- label="%POPUP_CONFIG_CLIENT_HANDLERS"
- 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.internal.consumption.ui.wizard.handlers.client">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="application-client.xml"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor.appfile">
- <action
- label="%POPUP_CONFIG_CLIENT_HANDLERS"
- 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.internal.consumption.ui.wizard.handlers.client">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef"
- nameFilter="*"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor.serviceref"
- adaptable="true">
- <action
- label="%POPUP_CONFIG_CLIENT_HANDLERS"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.client">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.wst.wsdl.util.WSDLResourceImpl"
- nameFilter="*"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard.wsdl.resource">
- <action
- label="%ACTION_GENERATE_JAVA_PROXY"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef"
- nameFilter="*"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard.serviceref">
- <action
- label="%ACTION_GENERATE_JAVA_PROXY"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.wst.wsdl.util.WSDLResourceImpl"
- nameFilter="*"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.genwsil.wsdl.resource">
- <action
- label="%POPUP_GENERATE_WSIL"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.consumption.ui.wsilimport">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef"
- nameFilter="*"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.genwsil.serviceref">
- <action
- label="%POPUP_GENERATE_WSIL"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.consumption.ui.wsilimport">
- </action>
- </objectContribution>
- </extension>
-
- <!-- Object Selection Widgets -->
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.objectSelectionWidget">
- <objectSelectionWidget
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.JavaBeanSelectionLaunchable"
- external_modify="true"
- id="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.JavaBeanSelectionWidget"
- transformer="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.JavaBeanSelectionTransformer">
- </objectSelectionWidget>
- </extension>
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.objectSelectionWidget">
- <objectSelectionWidget
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.EJBSelectionWidget"
- external_modify="false"
- id="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.EJBSelectionWidget"
- transformer="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.EJBSelectionTransformer">
- </objectSelectionWidget>
- </extension>
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.objectSelectionWidget">
- <objectSelectionWidget
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget"
- external_modify="true"
- id="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget"
- transformer="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionTransformer">
- </objectSelectionWidget>
- </extension>
-
- <!-- The following extension point is internal, though likely to be made public with changes in a future release. -->
- <extension-point id="wsImpl" name="%XP_wsImpl"/>
-
- <!-- The following extension point is internal, though likely to be made public with changes in a future release. -->
- <extension-point id="wsClientImpl" name="%XP_wsClientImpl"/>
-
- <!-- The following extension point is internal, though likely to be made public with changes in a future release. -->
- <extension-point id="runtimes" name="%XP_runtimes" />
-
- <!-- The following extension point is internal, though likely to be made public with changes in a future release. -->
- <extension-point id="serviceRuntimes" name="%XP_serviceRuntimes" />
-
- <!-- The following extension point is internal, though likely to be made public with changes in a future release. -->
- <extension-point id="clientRuntimes" name="%XP_clientRuntimes" />
-
- <!-- The following extension point is internal, though likely to be made public with changes in a future release. -->
- <extension-point id="tester" name="%XP_tester"/>
-
- <!-- The following extension point is internal, though likely to be made public with changes in a future release. -->
- <extension-point id="clientRuntimeProperties" name="%XP_clientRuntimesProperties" schema="schema/clientRuntimeProperties.exsd"/>
-
- <!-- The following extension point is internal, though likely to be made public with changes in a future release. -->
- <extension-point id="serviceRuntimeProperties" name="%XP_serviceRuntimesProperties" schema="schema/serviceRuntimeProperties.exsd"/>
-
-<!-- Test Extensions beginning -->
-
-<extension point="org.eclipse.jst.ws.consumption.ui.tester">
- <tester
- id="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WebServiceSampleTest"
- label="%SAMPLE_TYPE_WEBSERVICES_ID"
- testWSDL="no"
- testJavaProxy="yes"
- wsClientImplIds="org.eclipse.jst.ws.client.type.java"
- moduletypes="webmodule"
- methodsneeded="true"
- codeGenerated="true"
- serverRequired="true"
- isdefaultjaxrpc="true"
- allowClientRuntimesRestriction="true"
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample.GSTCWebServiceTester">
- </tester>
-</extension>
-<extension point="org.eclipse.jst.ws.consumption.ui.tester">
- <tester
- id="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.explorer.WebServiceExplorer"
- label="%WSEXPLORER_ID"
- testWSDL="yes"
- testJavaProxy="no"
- wsClientImplIds="org.eclipse.jst.ws.client.type.java"
- moduletypes="webmodule"
- methodsneeded="false"
- codeGenerated="false"
- serverRequired="false"
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.explorer.WSEWebServiceTester">
- </tester>
-</extension>
-
-<!-- Test Extensions end -->
-
-<extension point="org.eclipse.jst.ws.consumption.ui.wsImpl">
- <webServiceImpl
- id="org.eclipse.jst.ws.wsImpl.java"
- label="%WEBSERVICETYPE_NAME_JAVA"
- resourceTypeMetadata="File IResource CompilationUnit"
- extensionMetadata=".java .class"
- objectSelectionWidget="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.JavaBeanSelectionWidget"
- mergerClass="org.eclipse.jst.ws.internal.consumption.common.JavaMerger">
- </webServiceImpl>
-</extension>
-<extension point="org.eclipse.jst.ws.consumption.ui.wsClientImpl">
- <webServiceClientImpl
- id="org.eclipse.jst.ws.client.type.java"
- label="%JAVA_PROXY">
- </webServiceClientImpl>
-</extension>
-
- <extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
- <widgetFactory
- id="StartClientServer"
- insertBeforeCommandId="org.eclipse.jst.ws.internal.consumption.ui.extension.PreClientRunCommand"
- class="org.eclipse.jst.ws.internal.consumption.ui.server.StartClientWidgetFactory"/>
- </extension>
-
- <extension point="org.eclipse.wst.command.env.antScenario">
- <antScenario
- class="org.eclipse.jst.ws.internal.consumption.ui.ant.AntClientRootCommandFragment"
- scenarioType="client"/>
- </extension>
-
- <extension
- point="org.eclipse.wst.command.env.antDataMapping">
- <map
- key="InitialSelection"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ClientRuntimeSelectionWidgetDefaultingCommand"
- property="InitialInitialSelection"
- required="true"
- transform="org.eclipse.jst.ws.internal.common.String2SelectionTransformer"/>
- <map
- key="InitialSelection"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.WSDLSelectionWidgetDefaultingCommand"
- property="InitialSelection"
- required="true"
- transform="org.eclipse.jst.ws.internal.common.String2SelectionTransformer"/>
-
- <map
- key="Client.RuntimeId"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetOutputCommand"
- property="ClientTypeRuntimeServer"
- transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>
-
- <map
- key="Client.ServerId"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetOutputCommand"
- property="ClientTypeRuntimeServer"
- transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>
-
- <map
- key="Client.TypeId"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetOutputCommand"
- property="ClientTypeRuntimeServer"
- transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>
- <map
- key="TestService"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionDefaultingCommand"
- property="TestService"/>
-
- <map
- key="MonitorService"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionDefaultingCommand"
- property="MonitorService"/>
-
- <map
- key="Client.RuntimeId"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionDefaultingCommand"
- property="ClientTypeRuntimeServer"
- transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>
- <map
- key="Client.ServerId"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionDefaultingCommand"
- property="ClientTypeRuntimeServer"
- transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>
- <map
- key="Client.TypeId"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionDefaultingCommand"
- property="ClientTypeRuntimeServer"
- transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>
- <map
- key="ClientProjectName"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionDefaultingCommand"
- property="ClientProjectName"/>
- <map
- key="ClientProjectName"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ClientRuntimeSelectionWidgetDefaultingCommand"
- property="ClientProjectName"/>
- <map
- key="ClientEarProjectName"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionDefaultingCommand"
- property="ClientEarProjectName"/>
- <map
- key="ClientComponentType"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionDefaultingCommand"
- property="ClientComponentType"/>
- <map
- key="Client.RuntimeId"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionFragment"
- property="ClientTypeRuntimeServer"
- transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>
- <map
- key="Client.ServerId"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionFragment"
- property="ClientTypeRuntimeServer"
- transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>
- <map
- key="Client.TypeId"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionFragment"
- property="ClientTypeRuntimeServer"
- transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>
-
- <!-- mappings for listing options -->
- <map
- key="ListRuntimes"
- operation="org.eclipse.jst.ws.internal.consumption.ui.command.ListOptionsCommand"
- property="ListRuntimes"
- transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"
- />
-
- <map
- key="ListServers"
- operation="org.eclipse.jst.ws.internal.consumption.ui.command.ListOptionsCommand"
- property="ListServers"
- transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"
- />
- </extension>
-
- <extension
- point="org.eclipse.jst.ws.consumption.internalFacetOperationDelegate">
- <FacetOperationDelegate class="org.eclipse.jst.ws.internal.consumption.ui.common.FacetOperationDelegate" />
- </extension>
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/schema/clientProjectType.exsd b/bundles/org.eclipse.jst.ws.consumption.ui/schema/clientProjectType.exsd
deleted file mode 100644
index ee40db4..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/schema/clientProjectType.exsd
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.consumption.ui">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.ws.consumption.ui" id="clientProjectType" name="Client Project Type"/>
- </appInfo>
- <documentation>
- This extension point defines client container types.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="clientProjectType" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="clientProjectType">
- <complexType>
- <attribute name="include" type="string" use="required">
- <annotation>
- <documentation>
- This attribute contains a blank delimited list of Project Nature Ids. The listed IDs indicate that this type only works with these particular project types. For example, if this type only works with web projects an ID of org.eclipse.jst.j2ee.web.WebNature would be specified.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="exclude" type="string" use="required">
- <annotation>
- <documentation>
- This attribute contains a blank delimited list of Project Nature Ids. The listed IDs indicate that this type DOES NOT work with these particular project types. For example, if this type does not work with web projects an ID of org.eclipse.jst.j2ee.web.WebNature would be specified.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="label" type="string" use="required">
- <annotation>
- <documentation>
- This label represents this client project type. It is displayed to the user so it must be translated.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- A unique identifier for this client project type. This identifier is referenced in the clientProjectType attribute of the webServiceClientType element of an org.eclipse.jst.ws.consumption.ui.webServiceClientType extension.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- <b>This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.</b>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005 IBM Corporation and others.<br>
-All rights reserved. This program and the accompanying materials are made
-available under the terms of the Eclipse Public License v1.0 which accompanies
-this distribution, and is available at <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/schema/clientRuntimeProperties.exsd b/bundles/org.eclipse.jst.ws.consumption.ui/schema/clientRuntimeProperties.exsd
deleted file mode 100644
index a8b2cef..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/schema/clientRuntimeProperties.exsd
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.consumption.ui" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.ws.consumption.ui" id="clientRuntimeProperties" name="clientRuntimeProperties"/>
- </appInfo>
- <documentation>
- Internal Use Only. Client Runtime Properties.
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <appInfo>
- <meta.element internal="true" />
- </appInfo>
- </annotation>
- <complexType>
- <sequence>
- <element ref="clientRuntimeProperties" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="clientRuntimeProperties">
- <complexType>
- <choice>
- <sequence>
- <element ref="unsuitable-project-template" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <sequence>
- <element ref="suitable-project-template" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- </choice>
- <attribute name="clientRuntimeId" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="unsuitable-project-template">
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="suitable-project-template">
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- 3.2.2
- </documentation>
- </annotation>
-
-
- <annotation>
- <appInfo>
- <meta.section type="apiinfo"/>
- </appInfo>
- <documentation>
- Internal use only
- </documentation>
- </annotation>
-
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2010 IBM Corporation and others.<br>
-All rights reserved. This program and the accompanying materials are made
-available under the terms of the Eclipse Public License v1.0 which accompanies
-this distribution, and is available at <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/schema/objectSelectionWidget.exsd b/bundles/org.eclipse.jst.ws.consumption.ui/schema/objectSelectionWidget.exsd
deleted file mode 100644
index 752d429..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/schema/objectSelectionWidget.exsd
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.consumption.ui">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.ws.consumption.ui" id="objectSelectionWidget" name="Object Selection Widget"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="objectSelectionWidget" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="objectSelectionWidget">
- <annotation>
- <documentation>
- This extension point entry allows an extender to add new ways of browsing/finding artifacts that can be used to create Web services.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
- This class defines Selection Widget to be displayed on the Object Selection page of the Web services wizards. This class must implement the org.eclipse.jst.ws.consumption.ui.widgets.object.IObjectSelectionWidget interface.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- This id uniquely identifies this objectSelectionWidget element.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="transformer" type="string">
- <annotation>
- <documentation>
- This attribute specifies a class that must implement the org.eclipse.wst.command.internal.env.core.data.Transformer interface. This interface contains a transform method. Even though the type of the input parameter and the return value are of type Object it is expected that they will be used with the type org.eclipse.jface.viewers.IStructuredSelection. This transformation method allows the extender to modify the initial selection to an IStructuredSelection object that is more readily usable by the runtime server type.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="external_modify" type="boolean" use="default" value="false">
- <annotation>
- <documentation>
- This attribute specifies whether the object selection can be specified outside the object selection widget. An example, of this would be on page one of the web service widget by typing in a text field. If set to true, the extender of ObjectSelectionWidget must provide a validate(String) implementation that does any necessary validation and sets the object selection on the widget. The default value of this attribute is false. Any text fields will be set to READ_ONLY style so the object selection can only be modified with object selection widget implementation directly.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- <b>This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.</b>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005 IBM Corporation and others.<br>
-All rights reserved. This program and the accompanying materials are made
-available under the terms of the Eclipse Public License v1.0 which accompanies
-this distribution, and is available at <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/schema/serviceRuntimeProperties.exsd b/bundles/org.eclipse.jst.ws.consumption.ui/schema/serviceRuntimeProperties.exsd
deleted file mode 100644
index d3561bd..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/schema/serviceRuntimeProperties.exsd
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.consumption.ui" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.ws.consumption.ui" id="serviceRuntimeProperties" name="serviceRuntimeProperties"/>
- </appInfo>
- <documentation>
- Internal Use Only. Service Runtime Properties.
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <appInfo>
- <meta.element internal="true" />
- </appInfo>
- </annotation>
- <complexType>
- <sequence>
- <element ref="serviceRuntimeProperties" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="serviceRuntimeProperties">
- <complexType>
- <choice>
- <sequence>
- <element ref="unsuitable-project-template" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <sequence>
- <element ref="suitable-project-template" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- </choice>
- <attribute name="serviceRuntimeId" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="unsuitable-project-template">
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="suitable-project-template">
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- 3.2.2
- </documentation>
- </annotation>
-
-
- <annotation>
- <appInfo>
- <meta.section type="apiinfo"/>
- </appInfo>
- <documentation>
- Internal use only
- </documentation>
- </annotation>
-
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2010 IBM Corporation and others.<br>
-All rights reserved. This program and the accompanying materials are made
-available under the terms of the Eclipse Public License v1.0 which accompanies
-this distribution, and is available at <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceClientType.exsd b/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceClientType.exsd
deleted file mode 100644
index 53bdd3c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceClientType.exsd
+++ /dev/null
@@ -1,257 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.consumption.ui">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.ws.consumption.ui" id="webServiceClientType" name="Web Service Client Types"/>
- </appInfo>
- <documentation>
- This extension point defines Web Service Client types. This is done by defining webServiceClientType elements. These elements refer to a server and a Web Service runtime. These are respectively defined in the webServiceServer element and the webServiceRuntime element.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="webServiceServer" minOccurs="1" maxOccurs="unbounded"/>
- <element ref="webServiceRuntime" minOccurs="1" maxOccurs="unbounded"/>
- <element ref="webServiceClientType" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="webServiceServer">
- <annotation>
- <documentation>
- This element specifies information about a particular server type.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="factoryId" type="string" use="required">
- <annotation>
- <documentation>
- This is the factory id for a server. This id is defined by
-the org.eclipse.wst.server.core.serverTypes extension point.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="isDefault" type="boolean" use="required">
- <annotation>
- <documentation>
- This parameter indicates if this server should be used as the default server. Note: this default parameter is only used in the absence of other information. If the user has defined a particular server as their default then this parameter is ignored. Should contain a value of either "true" or "false".
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- This is a local ID for this server. The server attribute of the webserviceClientType element refers to this ID.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="runtimeTypeIds" type="string">
- <annotation>
- <documentation>
- This attribute is currently a place holder for future development. Please, do not use.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="webServiceRuntime">
- <annotation>
- <documentation>
- This element specifies information about a particular Web Services runtime.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="label" type="string" use="required">
- <annotation>
- <documentation>
- This label is displayed to the user for this runtime. Therefore, is must be translated.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="description" type="string">
- <annotation>
- <documentation>
- A description of this Web Services runtime.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="isDefault" type="boolean" use="required">
- <annotation>
- <documentation>
- This parameter indicates if this runtime should be used as the default runtime. Note: this default parameter is only used in the absence of other information. If the user has defined a particular runtime as their default then this parameter is ignored. Should contain a value of either "true" or "false".
- </documentation>
- </annotation>
- </attribute>
- <attribute name="j2eeversion" type="string" use="required">
- <annotation>
- <documentation>
- This attribute specifies the J2EE versions supported by this runtime. The allowable values are 12, 13, and 14. If more than one J2EE version is supported each J2EE level should be specified with a blank delimiter.(eg. if J2EE version 1.2 and 1.3 are supported then this attribute string would be "12 13".
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="webServiceClientType">
- <annotation>
- <documentation>
- This element specifies information about a particular Web Services client type.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- This is the ID for this Web Service Client type.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
- This is the name for this Web Service Client type. It is displayed to the user so it must be translated.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="clientType" type="string" use="required">
- <annotation>
- <documentation>
- This is the kind of Web Service Client type being defined. (ie. the value of the Java client is org.eclipse.jst.ws.client.type.java.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="runtime" type="string" use="required">
- <annotation>
- <documentation>
- This is the runtime ID for this Web Service client type. There should be a corresponding webServiceRuntime element with an attribute called id that has this value.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="server" type="string" use="required">
- <annotation>
- <documentation>
- This attribute specifies the server for this Web Service client type. There should be a corresponding webServiceServer element with an attribute called id that has this value.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="clientProjectType" type="string" use="default" value="org.eclipse.jst.ws.consumption.ui.clientProjectType.Web">
- <annotation>
- <documentation>
- This attribute contains a space delimited list of client project type ids supported by this by this webServiceClientType element. The client project type ids are defined by the org.eclipse.jst.ws.consumption.ui.clientProjectType extension point.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="developBinding" type="string">
- <annotation>
- <documentation>
- This attribute specifies a CommandWidgetBinding class. This class specifies the Commands and UI elements associate with J2EE development phase. The Command and UI elements in this binding always come first in the wizard.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="assemblyBinding" type="string">
- <annotation>
- <documentation>
- This attribute specifies a CommandWidgetBinding class. This class specifies the Commands and UI elements associate with J2EE assembly phase. The Command and UI elements in this binding always come after the development phase binding in the wizard.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="deployBinding" type="string">
- <annotation>
- <documentation>
- This attribute specifies a CommandWidgetBinding class. This class specifies the Commands and UI elements associate with J2EE deploy phase. The Command and UI elements in this binding always come after the assembly phase binding in the wizard.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="installBinding" type="string">
- <annotation>
- <documentation>
- This attribute specifies a CommandWidgetBinding class. This class specifies the Commands and UI elements associate with J2EE install phase. The Command and UI elements in this binding always come after the deploy phase binding in the wizard.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- <b>This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.</b>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005 IBM Corporation and others.<br>
-All rights reserved. This program and the accompanying materials are made
-available under the terms of the Eclipse Public License v1.0 which accompanies
-this distribution, and is available at <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceServerRuntimeType.exsd b/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceServerRuntimeType.exsd
deleted file mode 100644
index cbdd711..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceServerRuntimeType.exsd
+++ /dev/null
@@ -1,325 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.consumption.ui">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.ws.consumption.ui" id="webServiceServerRuntimeType" name="Web Service Server Runtime Types"/>
- </appInfo>
- <documentation>
- This extension point defines Web Service Server types. This is done by defining webServiceServerRuntimeType elements. These elements refer to a server and a Web Service runtime. These are respectively defined in the webServiceServer element and the webServiceRuntime element.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="webServiceServer" minOccurs="1" maxOccurs="unbounded"/>
- <element ref="webServiceRuntime" minOccurs="1" maxOccurs="unbounded"/>
- <element ref="webServiceServerRuntimeType" minOccurs="1" maxOccurs="unbounded"/>
- <element ref="webServiceType" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="webServiceServer">
- <annotation>
- <documentation>
- This element specifies information about a particular server type.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="factoryId" type="string" use="required">
- <annotation>
- <documentation>
- This is the factory id for a server. This id is defined by
-the org.eclipse.wst.server.core.serverTypes extension point.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="isDefault" type="boolean" use="required">
- <annotation>
- <documentation>
- This parameter indicates if this server should be used as the default server. Note: this default parameter is only used in the absence of other information. If the user has defined a particular server as their default then this parameter is ignored. Should contain a value of either "true" or "false".
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- This is a local ID for this server. The server attribute of the webserviceServerRuntimeType element refers to this ID.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="runtimeTypeIds" type="string">
- <annotation>
- <documentation>
- This attribute is currently a place holder for future development. Please, do not use.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="webServiceRuntime">
- <annotation>
- <documentation>
- This element specifies information about a particular Web Services runtime.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="label" type="string" use="required">
- <annotation>
- <documentation>
- This label is displayed to the user for this runtime. Therefore, is must be translated.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="description" type="string">
- <annotation>
- <documentation>
- A description of this Web Services runtime.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="isDefault" type="boolean" use="required">
- <annotation>
- <documentation>
- This parameter indicates if this runtime should be used as the default runtime. Note: this default parameter is only used in the absence of other information. If the user has defined a particular runtime as their default then this parameter is ignored. Should contain a value of either "true" or "false".
- </documentation>
- </annotation>
- </attribute>
- <attribute name="j2eeversion" type="string" use="required">
- <annotation>
- <documentation>
- This attribute specifies the J2EE versions supported by this runtime. The allowable values are 12, 13, and 14. If more than one J2EE version is supported each J2EE level should be specified with a blank delimiter.(eg. if J2EE version 1.2 and 1.3 are supported then this attribute string would be "12 13".
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="webServiceServerRuntimeType">
- <annotation>
- <documentation>
- This element specifies information about a particular Web Services server runtime type. An entry for this element defines a valid combination of server, runtime, and webservice type.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- This is the ID for this Web Service Server Runtime type.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
- This is the name for this Web Service Server Runtime type. It is displayed to the user so it must be translated.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="runtime" type="string" use="required">
- <annotation>
- <documentation>
- This is the runtime ID for this Web Service Server Runtime type. There should be a corresponding webServiceRuntime element with an attribute called id that has this value.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="server" type="string" use="required">
- <annotation>
- <documentation>
- This attribute specifies the server for this Web Service Server Runtime type. There should be a corresponding webServiceServer element with an attribute called id that has this value.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="type" type="string" use="required">
- <annotation>
- <documentation>
- This is the kind of Web Service Runtime type being defined. (eg. the value of a Java Bean Webservice is org.eclipse.jst.ws.type.java)
-There should be a corresponding webServiceType element with an attribute called id that has this value.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="developBinding" type="string">
- <annotation>
- <documentation>
- This attribute specifies a CommandWidgetBinding class. This class specifies the Commands and UI elements associate with J2EE development phase. The Command and UI elements in this binding always come first in the wizard.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="assemblyBinding" type="string">
- <annotation>
- <documentation>
- This attribute specifies a CommandWidgetBinding class. This class specifies the Commands and UI elements associate with J2EE assembly phase. The Command and UI elements in this binding always come after the development phase binding in the wizard.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="deployBinding" type="string">
- <annotation>
- <documentation>
- This attribute specifies a CommandWidgetBinding class. This class specifies the Commands and UI elements associate with J2EE deploy phase. The Command and UI elements in this binding always come after the assembly phase binding in the wizard.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="installBinding" type="string">
- <annotation>
- <documentation>
- This attribute specifies a CommandWidgetBinding class. This class specifies the Commands and UI elements associate with J2EE install phase. The Command and UI elements in this binding always come after the deploy phase binding in the wizard.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="requireEJBModule" type="boolean" use="required">
- <annotation>
- <documentation>
- If the Webservice for this Server Runtime Type is required to be in an EJB module then the value of this attribute should be true.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="requireWebModule" type="boolean" use="required">
- <annotation>
- <documentation>
- If the Webservice for this Server Runtime Type is required to be in an Web module then the value of this attribute should be true.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="webServiceType">
- <annotation>
- <documentation>
- This element defines a particular Web service kind. Such as a Java Bean web service, a Skeleton Web service, an EJB Web service, etc.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- This a unique ID for this Web service type. It is referenced in the webServiceServerRuntimeType element with the type attribute.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="label" type="string" use="required">
- <annotation>
- <documentation>
- This is a translatable label for this web service type.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="resourceTypeMetadata" type="string" use="required">
- <annotation>
- <documentation>
- This attribute contains a blank delimited list class Names. (ie.No package prefix) The classes listed define the allowable Eclipse resources that this web service type understands and turn into a Web service. For example, if a user selects a Java source file in the package explorer view and then starts the Web services wizard a CompilationUnit object will be passed in as part of an IStructuredSelection. By putting "CompilationUnit" as one of the classes in this attribute it indicates that this type can create a Web service from the CompilationUnit.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="extensionMetadata" type="string" use="required">
- <annotation>
- <documentation>
- This attribute allows this Web service type to restrict names of the input files that it understands. For example, if the value is set to ".java .class" it indicates that this Web service type only understands resource names that end with .java or end with .class.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="objectSelectionWidget" type="string" use="required">
- <annotation>
- <documentation>
- On page 2 of the Web service wizard there is an Object selection page. This selection page can be customized using this attribute, since different Web service types may need different methods of selecting them. The value of this attribute should be the id of a org.eclipse.jst.ws.consumption.ui.objectSelectionWidget extension. The predefined id for a Java selection widget is org.eclipse.jst.ws.consumption.ui.widgets.object.JavaBeanSelectionWidget. The predefined id for a WSDL selection widget is org.eclipse.jst.ws.consumption.ui.widgets.object.WSDLSelectionWidget. The predefined id for an EJB selection widget is org.eclipse.jst.ws.consumption.ui.widgets.object.EJBSelectionWidget.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="includeNatures" type="string" use="required">
- <annotation>
- <documentation>
- This attribute contains a blank delimited list of Project Nature Ids. The listed IDs indicate that this type only works with these particular project types. For example, if this type only works with web projects an ID of org.eclipse.jst.j2ee.web.WebNature would be specified.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="excludeNatures" type="string" use="required">
- <annotation>
- <documentation>
- This attribute contains a blank delimited list of Project Nature Ids. The listed IDs indicate that this type DOES NOT work with these particular project types. For example, if this type does not work with web projects an ID of org.eclipse.jst.j2ee.web.WebNature would be specified.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- <b>This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.</b>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005 IBM Corporation and others.<br>
-All rights reserved. This program and the accompanying materials are made
-available under the terms of the Eclipse Public License v1.0 which accompanies
-this distribution, and is available at <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceTest.exsd b/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceTest.exsd
deleted file mode 100644
index 20bf630..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceTest.exsd
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.consumption.ui">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.ws.consumption.ui" id="webServiceTest" name="Web Service Test"/>
- </appInfo>
- <documentation>
- This extension point defines Web service test facilities that can be plugged into the Web services wizards.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="webServiceTest" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="webServiceTest">
- <complexType>
- <attribute name="methodsneeded" type="boolean">
- <annotation>
- <documentation>
- This attribute indicates if this test facility need to methods from a proxy bean.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- The value of this attribute is displayed to the user for this test facility. It must be translated.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="java" type="boolean">
- <annotation>
- <documentation>
- This attribute indicates whether this test facility is intended for clients that generate a Java bean as output.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="codegen" type="boolean">
- <annotation>
- <documentation>
- This attribute indicates if this test facility generates code or not, such as JSP files.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="class" type="string">
- <annotation>
- <documentation>
- This attribute contains a class name. The class must implement org.eclipse.jst.ws.ext.WebServiceExecutable. This class allows the extender to provide the Commands that will execute for this test facility.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- This is a unique identifier for this test facility.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- <b>This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.</b>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005 IBM Corporation and others.<br>
-All rights reserved. This program and the accompanying materials are made
-available under the terms of the Eclipse Public License v1.0 which accompanies
-this distribution, and is available at <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/ConsumptionUI.properties b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/ConsumptionUI.properties
deleted file mode 100644
index c0a4757..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/ConsumptionUI.properties
+++ /dev/null
@@ -1,663 +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 124143 rsinha@ca.ibm.com - Rupam Kuehner
-# 20060204 124408 rsinha@ca.ibm.com - Rupam Kuehner
-# 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner
-# 20060321 128827 joan - Joan Haggarty
-# 20060329 128069 rsinha@ca.ibm.com - Rupam Kuehner
-# 20060407 135443 joan@ca.ibm.com - Joan Haggarty
-# 20060411 136134 kathy@ca.ibm.com - Kathy Chan
-# 20060417 136390 joan@ca.ibm.com - Joan Haggarty
-# 20060413 135581 rsinha@ca.ibm.com - Rupam Kuehner
-# 20060418 136335 joan@ca.ibm.com - Joan Haggarty
-# 20060420 136158 rsinha@ca.ibm.com - Rupam Kuehner
-# 20060420 120714 kathy@ca.ibm.com - Kathy Chan
-# 20060420 135912 joan@ca.ibm.com - Joan Haggarty
-# 20060510 141115 rsinha@ca.ibm.com - Rupam Kuehner
-# 20060509 119296 pmoogk@ca.ibm.com - Peter Moogk
-# 20060602 145054 kathy@ca.ibm.com - Kathy Chan
-# 20070427 177360 pmoogk@ca.ibm.com - Peter Moogk
-# 20071031 140518 joan@ca.ibm.com - Joan Haggarty
-# 20080318 213330 trungha@ca.ibm.com - Trung, Non-conventional Java naming prevents creating Web Services (client)
-# 20080326 171705 trungha@ca.ibm.com - Trung, improve AntTask errors report
-# 20080325 184761 gilberta@ca.ibm.com - Gilbert Andrews
-# 20080331 225032 makandre@ca.ibm.com - Andrew Mak, Error msg references renamed category
-# 20080416 215084 gilberta@ca.ibm.com - Gilbert Andrews
-# 20080425 221232 gilberta@ca.ibm.com - Gilbert Andrews
-# 20090302 249602 ericdp@ca.ibm.com - Eric D. Peters, PII- association warning message needs update
-# 20090401 269994 ericdp@ca.ibm.com - Eric D. Peters, NLS- Validation messages unclear when servers don't support runtime/project combo
-# 20090909 244814 mahutch@ca.ibm.com - Mark Hutchinson
-# 20100511 309395 mahutch@ca.ibm.com - Mark Hutchinson, WS Wizard Converting Java Project into Utility Project without any warning
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-
-PLUGIN_NEW_WIZARD_NAME_WS_CLIENT=Web Service Client
-#
-# Web services "Internet" preferences extension.
-#
-
-#
-# Web Samples IDs
-#
-
-#
-# Pop-up actions
-#
-ACTION_GENERATE_JAVA_PROXY=Generate Client
-
-#
-# Dialogs
-#
-CHECKBOX_SHOW_GENERATE_JAVA_PROXY_DIALOG=Show Generate Java bean Proxy Dialog
-TOOLTIP_PPAD_CHECKBOX_WSDL2PROXY=Show the dialog for generating the Java bean proxy action.
-
-#
-# Web Services Preferance Pages
-#
-# Categories
-#
-
-#
-# Preferences Tooltips
-#
-
-#
-#Server Runtime Preferences
-#
-TOOLTIP_SRPF_COMBO_SERVER=The preferred server type
-TOOLTIP_SRPF_COMBO_RUNTIME=The preferred Web service runtime
-TOOLTIP_SRPF_COMBO_J2EE=The preferred J2EE version
-
-#
-# General messages.
-#
-MSG_ERROR_TASK_EXCEPTED=IWAB0234E An internal error occurred. Details: {0}
-MSG_ERROR_NO_SERVER_RUNTIME=No suitable server can be found for the {0} Web service runtime. Go to Window > Preferences. Select Server > Runtime Environments and configure a server runtime.
-MSG_ERROR_NO_SERVER_RUNTIME_INSTALLED={0} is not installed. Go to Window > Preferences. Select Server > Runtime Environments and configure a server runtime.
-
-
-#
-# Wizard page task labels and descriptions
-# (used only for progress indication).
-#
-
-#
-# Common wizard strings.
-#
-LABEL_FOLDER_NAME=Folder:
-LABEL_JSP_FOLDER_NAME=JSP folder:
-LABEL_WEB_PROJECT_NAME=Web project:
-LABEL_WEBSERVICETYPE=&Web service type:
-LABEL_WEBSERVICEIMPL=Service implementation:
-LABEL_WEBSERVICEDEF=Service definition:
-LABEL_J2EE_VERSION=J2EE version:
-LABEL_NA=N/A
-
-BUTTON_BROWSE=B&rowse...
-BUTTON_BROWSE_FILES=Browse files...
-
-BOTTOMUP_LABEL=Bottom up
-TOPDOWN_LABEL=Top down
-CLIENT_LABEL=Client
-COMBINED_TYPE_AND_RUNTIME_LABEL={0} {1}
-
-#
-# Wizards.
-#
-WIZARD_TITLE_WSC=Web Service Client
-
-#
-# WebServiceProjectPage
-#
-PAGE_TITLE_WS_PROJECT=Web Services
-PAGE_DESC_WS_SERVICE=Select a service implementation or definition and move the sliders to set the level of service and client generation.
-PAGE_DESC_WS_CLIENT=Select a service definition and move the slider to set the level of client generation.
-BUTTON_START_WEB_PROJECT=&Start Web service in Web project
-#BUTTON_DEPLOY_WEB_PROJECT=Deploy Web service to a server type
-BUTTON_INSTALL_SERVICE_WEB_PROJECT=&Install Web service on server
-BUTTON_INSTALL_CLIENT_WEB_PROJECT=Install Web service &client on server (managed clients only)
-GROUP_SCENARIO_SERVICE=Service
-GROUP_SCENARIO_CLIENT=Client proxy
-LABEL_WEBSERVICECLIENTTYPE=&Client type:
-
-TOOLTIP_WSWSCEN_SERVICEPROJECT_LINK=Click on the link to edit service project and EAR settings.
-TOOLTIP_WSWSCEN_CLIENTPROJECT_LINK=Click on the link to edit client project and EAR settings.
-
-DIALOG_TITILE_SERVICE_IMPL_SELECTION=Select Service Implementation
-DIALOG_TITILE_SERVICE_DEF_SELECTION=Select Service Definition
-DIALOG_TITILE_SERVICE_PROJECT_SETTINGS=Specify Service Project Settings
-DIALOG_TITILE_CLIENT_PROJECT_SETTINGS=Specify Client Project Settings
-
-# Items common to WebServiceRuntimeSelectionPage and WebServiceClientRuntimeSelectionPage
-# WebServiceRuntimeSelectionPage
-LABEL_SUMMARY=Configuration:
-LABEL_SUMMARY_NO_CLIENT=Configuration: No client generation.
-PAGE_TITLE_WS_RUNTIME_SELECTION=Service Deployment Configuration
-PAGE_DESC_WS_RUNTIME_SELECTION=Choose from the list of runtimes and deployment servers, or use the default settings.
-LABEL_RUNTIMES_LIST=Web service runtime:
-LABEL_SERVERS_LIST=Server runtime:
-LABEL_SERVERS_INSTANCES=Server name:
-LABEL_EDIT_BUTTON=Edit...
-LABEL_SERVICE_EAR_MODULE=Service EAR module:
-LABEL_CLIENT_EAR_MODULE=Client EAR module:
-LABEL_CLIENT_MODULE=Client module:
-LABEL_SERVICE_MODULE=Service module:
-LABEL_CLIENT_PROJECT=Client project:
-LABEL_SERVICE_PROJECT=Service project:
-LABEL_CLIENT_EAR_PROJECT=Client EAR project:
-LABEL_SERVICE_EAR_PROJECT=Service EAR project:
-
-#
-# Client component type labels
-#
-LABEL_CLIENT_COMP_TYPE_WEB=Web
-LABEL_CLIENT_COMP_TYPE_EJB=EJB
-LABEL_CLIENT_COMP_TYPE_APP_CLIENT=Application Client
-LABEL_CLIENT_COMP_TYPE_CONTAINERLESS=Java
-
-
-TOOLTIP_PWRS_TEXT_RUNTIME=Click on the link to specify the web service runtime.
-TOOLTIP_PWRS_TEXT_SERVER=Click on the link to specify a server.
-TOOLTIP_PWRS_J2EE_VERSION=J2EE version to be used.
-
-LABEL_SELECTION_VIEW_TITLE=Server-Side Deployment Selection:
-LABEL_SELECTION_VIEW_RUNTIME=Choose Web service runtime first
-LABEL_SELECTION_VIEW_SERVER=Choose server first
-LABEL_SELECTION_VIEW_EXPLORE=Explore options
-
-LABEL_TREE_EXISTING_SERVERS=Existing Servers
-LABEL_TREE_SERVER_TYPES=Server Types
-
-MSG_NO_OBJECT_SELECTION=Select a service implementation.
-MSG_NO_SERVICE_SELECTION=Select a service definition.
-MSG_WARN_SERVICE_IMPL_NAMING_CONVENTION=The service implementation selected does not follow Java naming conventions.
-MSG_INVALID_SERVICE_IMPL=The service implementation selected is invalid.
-MSG_INVALID_SERVICE_DEF=The service definition selected is invalid.
-MSG_INVALID_SRT_SELECTIONS={0} does not support the {1} Web service runtime. Choose a different server or runtime to proceed through the Web services wizard.
-MSG_NO_RUNTIME=No runtime specified for the {0} scenario.
-MSG_NO_SERVER=No server specified for the {0} scenario.
-MSG_ERROR_STUB_ONLY={0} has only stub runtimes associated with it. Choose a different server or configure a non-stub runtime in the server preferences.
-MSG_WARN_STUB_ONLY={0} has only stub runtimes associated with it so the server will not be created or started.
-MSG_WARN_NO_SERVICE_SERVER=No server has been selected. The Web service will not be deployed, installed, or run.
-MSG_WARN_NO_CLIENT_SERVER=No server has been selected. The Web service client will not be deployed, installed, or run.
-MSG_WARN_CONVERTED_TO_UTIL=The Java Project {0} will be converted to a Utility Project
-
-MSG_SERVER_TARGET_MISMATCH=The project, {0}, has a server target which is not compatible with the selected server type
-MSG_J2EE_MISMATCH=The project, {0}, has a different J2EE level from the selected J2EE level
-MSG_SERVICE_PROJECT_EMPTY=The service project {0} cannot be empty. Select a service project {0}.
-MSG_SERVICE_PROJECT_TYPE_EMPTY=Select a service project type.
-MSG_SERVICE_EAR_EMPTY=The service EAR {0} cannot be empty. Select a service EAR {0}.
-MSG_CLIENT_PROJECT_EMPTY=The client project {0} cannot be empty. Select a client project {0}.
-MSG_CLIENT_PROJECT_TYPE_EMPTY=Select a client project type.
-MSG_CLIENT_EAR_EMPTY=The client EAR {0} cannot be empty. Select a client EAR {0}.
-
-MSG_INVALID_EJB_PROJECT={0} is not an EJB project. Choose an EJB project, or enter a new EJB project name.
-MSG_INVALID_WEB_PROJECT={0} is not a Web project. Choose a Web project, or enter a new Web project name.
-MSG_INVALID_PROJECT_TYPE={0} is not a {1} project. Choose a {1} project, or enter a new project name.
-MSG_MODULE=module
-MSG_MODULE_NAME_AND_PROJECT_NAME_NOT_THE_SAME=The flexible project preference is off. Therefore, project names and module names must be the same for new modules.
-
-MSG_SERVICE_RUNTIME_DOES_NOT_SUPPORT_PROJECT=The {0} Web service runtime in {1} does not support the service project {2}.
-MSG_SERVICE_SERVER_DOES_NOT_SUPPORT_PROJECT=The {0} server does not support the service project {1}.
-MSG_SERVICE_SERVER_DOES_NOT_SUPPORT_JAVAPROJECT=The {0} server does not support the Java project {1}.
-MSG_SERVICE_RUNTIME_DOES_NOT_SUPPORT_TEMPLATE=The {0} Web service runtime in {1} does not support the service project type {2}.
-MSG_SERVICE_SERVER_DOES_NOT_SUPPORT_TEMPLATE=The {0} server does not support the service project type {1}.
-
-MSG_CLIENT_RUNTIME_DOES_NOT_SUPPORT_PROJECT=The {0} Web service runtime in {1} does not support the client project {2}.
-MSG_CLIENT_SERVER_DOES_NOT_SUPPORT_PROJECT=The {0} server does not support the client project {1}.
-MSG_CLIENT_RUNTIME_DOES_NOT_SUPPORT_TEMPLATE=The {0} Web service runtime in {1} does not support the client project type {2}.
-MSG_CLIENT_SERVER_DOES_NOT_SUPPORT_TEMPLATE=The {0} server does not support the client project type {1}.
-
-MSG_SAME_CLIENT_AND_SERVICE_EARS=Your selected service and client {0} modules have the same name. Proceeding with this configuration may result in runtime errors.
-MSG_SAME_CLIENT_AND_SERVICE_COMPONENTS=Your selected service and client {0} modules have the same name. Proceeding with this configuration will result in runtime errors.
-MSG_SAME_CLIENT_AND_SERVICE_PROJECTS=Your selected service and client projects are the same. Proceeding with this configuration will result in errors.
-MSG_WRONG_CLIENT_PROJECT_TYPE=The selected client project, {0}, is not a {1} project. Please select a {1} project or enter a new project name.
-MSG_CLIENT_SUB=client
-MSG_SERVICE_SUB=service
-MSG_GENERAL_PROJECT_AND_EAR=Select the {0} project and the EAR project with which you want it to be associated.
-MSG_EAR_PROJECT_WILL_BE_CREATED=If an EAR or project does not exist or is currently unassociated, it will be created and \nassociated as required when you click Next.
-
-MSG_EAR_WILL_BE_ASSOCIATED=The selected {0} project will be associated with the EAR project.
-MSG_PROJECT_WILL_BE_CREATED=The {0} project will be created and associated with the EAR project.
-MSG_EAR_WILL_BE_CREATED=The {0} EAR project will be created and associated with the project.
-MSG_PROJECT_AND_EAR_CREATED=The {0} project and EAR project will be created and associated with one another.
-
-MSG_CLIENT_CANNOT_ASSOCIATE=The client project, {0}, is at an incompatible Java EE specification level than that of the "{1}" Enterprise Application.
-MSG_SERVICE_CANNOT_ASSOCIATE=The service project, {0}, is at an incompatible Java EE specification level than that of the "{1}" Enterprise Application.
-
-MSG_PROJECT_MUST_EXIST=No server can be found and {0} does not exist. Choose an existing project or use the preferences to configure a server runtime.
-
-MSG_LOADING_WEB_SERVICE=Loading Web Services
-
-# WebServiceClientRuntimeSelectionPage
-PAGE_TITLE_WS_CLIENT_RUNTIME_SELECTION=Client Environment Configuration
-PAGE_DESC_WS_CLIENT_RUNTIME_SELECTION=Choose from the list of supported runtimes and servers for the client environment, or use the default settings.
-
-LABEL_CLIENT_SELECTION_VIEW_TITLE=Client-Side Environment Selection:
-LABEL_CLIENT_TYPE=Client Project type:
-LABEL_SERVICE_TYPE=Service Project type:
-LABEL_WEB=Web
-LABEL_EJB=EJB
-LABEL_NO_LABEL=
-
-#
-# Items common to WebServiceMappingsPage, WebServiceMappingsPage (client), and WebServiceSOAPBindingPage
-#
-PAGE_MSG_VALIDATION_INTERNAL_ERROR=An internal error occurred during page validation. See logs for details.
-
-#
-# WebServiceMappingsPage
-#
-PAGE_TITLE_WS_XML2BEAN=Web Service Skeleton XML to Java Mappings
-PAGE_DESC_N2P_MAPPINGS=Define custom mapping for namespace to package.
-MSG_MAPPING_DUPLICATE_ENTRIES=Duplicate {0} mapped to the same {1}.
-
-
-#
-# The two ITEM_* strings are entries in a list box of mappings.
-# There are two forms, one when the page is in Java-to-XML mode:
-# <java-bean-name>, <encoding-style>
-# and one when the page is in XML-to-Java mode:
-# <xml-namespace-uri>:<xml-short-name>, <encoding-style>
-# where:
-# <java-bean-name> is a fully-qualified Java class name
-# <xml-namespace-uri> is the namespace of an XML type
-# <xml-short-name> is the XML type name within the namespace
-# <encoding-style> is the encoding style (SOAP or Literal XML)
-#
-
-#
-# WebServiceProxyPage
-#
-BUTTON_GENERATE_PROXY=&Generate a proxy
-
-#
-# WebServiceSkeletonConfigPage
-#
-PAGE_DESC_WSSKEL_CONFIG=Define a skeleton Java bean as a Web service.
-PAGE_TITLE_WSSKEL_CONFIG=Web Service Skeleton Java Bean Configuration
-TOOLTIP_PBSC_TEXT_SKELETON_FOLDER=Folder for generated Java skeleton.
-TOOLTIP_PBSC_BUTTON_SKELETON_FOLDER_BROWSE=Browse folders.
-LABEL_SKELETON_ROOT_NAME=Skeleton folder:
-
-#
-# WebServiceBeanClassPage
-#
-LABEL_BEAN_CLASS_NAME=Bean:
-PAGE_MSG_BEAN_CANNOT_BE_EMPTY=Please select a Java bean class.
-BUTTON_BROWSE_CLASSES=Browse classes...
-
-
-#
-# WebServiceTestPage
-#
-PAGE_TITLE_WSTEST=Test Web Service
-PAGE_DESC_WSTEST=Select a test facility
-CHECKBOX_TEST_WEBSERVICE=&Test the Web service
-CHECKBOX_MONITOR_WEBSERVICE=&Monitor the Web service
-CHECKBOX_OVERWRITE_FILES=&Overwrite files without warning
-MSG_ERROR_UNABLE_TO_LAUNCH_WSDL_TEST=An error occurred. Unable to launch WSDL test facility.
-
-#
-# WebServiceExplorerPage
-#
-BUTTON_LAUNCH_SERVICE_TEST=Launch
-
-#
-# WebServiceClientTestPage
-#
-PAGE_TITLE_WS_SAMPLE=Web Service Client Test
-PAGE_DESC_WS_SAMPLE=Do you want to test the generated proxy?
-BUTTON_TEST=Test the generated proxy
-LABEL_TEST_TYPES=Test facility:
-BUTTON_RUN_TEST=Run test on server
-LABEL_METHODS=Methods
-LABEL_JSP_PROJECT_NAME=JSP project:
-MSG_ERROR_JTS_PROXY_NOT_COMPILED=IWAB0357E The Generated proxy was not found. WebService sample jsps cannot be generated.
-MSG_ERROR_MALFORMED_URL=IWAB0358E Test client URL is malformed.
-MSG_ERROR_MODULE_DEPENDENCY=Unable to establish module dependency from {0} to {1}.
-
-#
-# WebServiceBeanMethodsPage
-#
-BUTTON_SELECT_ALL=Select All
-BUTTON_DESELECT_ALL=Deselect All
-TOOLTIP_PBME_BUTTON_SELECT_ALL=Select all methods
-TOOLTIP_PBME_BUTTON_DESELECT_ALL=Deselect all methods
-
-#
-# WebServiceWSDLSelectionPage
-#
-PAGE_TITLE_WSDL_SELECTION=Web Service WSDL File Selection
-PAGE_DESC_WSDL_SELECTION=Select a WSDL file.
-
-#
-# WebServicePublishPage
-#
-PAGE_TITLE_WS_PUBLISH=Web Service Publication
-PAGE_DESC_WS_PUBLISH=Do you want to publish your Web service?
-PAGE_TITLE_WS_FIND=Find a Web service
-PAGE_DESC_WS_FIND=Do you want to find a Web service?
-BUTTON_WS_PUBLISH=&Launch the Web Services Explorer to publish this Web service to a UDDI Registry
-BUTTON_WS_PUBLISH_PRIVATE_UDDI=Launch the Web Services Explorer to publish this Web service to the Unit Test UDDI Registry
-BUTTON_WS_FIND=Launch the Web Services Explorer to find a Web service from a UDDI Registry
-BUTTON_WS_FIND_PRIVATE_UDDI=Launch the Web Services Explorer to find a Web service from the Unit Test UDDI Registry
-LABEL_PUBLIC_UDDI_REGISTRIES=Public UDDI Registry
-
-#
-# EJB UI strings
-#
-LABEL_EJB_BEAN_NAME=EJB bean
-TABLE_TITLE_EJB_BEAN_NAMES=Stateless EJB beans
-TABLE_TITLE_EJB_PROJECT_NAME=EJB project
-LABEL_EAR_PROJECTS=EAR project:
-TOOLTIP_EAR_PROJECTS=Enterprise application projects.
-TOOLTIP_TABLE_BEAN_NAMES=Select an EJB.
-LABEL_SHOW_ALL_STATELESS_SESSION_EJBS=<<Show all stateless session EJBs>>
-
-#
-# Tooltips for WebServiceWSDLSelectionPage
-#
-TOOLTIP_PWWS_PAGE=
-
-#
-# Tooltips for Web Service Wizard Scenario Page
-#
-BUTTON_WSWSCEN_PUBLISH=&Publish the Web service
-TOOLTIP_WSWSCEN_SCALE_DEVELOP=Develop
-TOOLTIP_WSWSCEN_SCALE_ASSEMBLE=Assemble
-TOOLTIP_WSWSCEN_SCALE_DEPLOY=Deploy
-TOOLTIP_WSWSCEN_SCALE_INSTALL=Install
-TOOLTIP_WSWSCEN_SCALE_RUN=Start
-TOOLTIP_WSWSCEN_SCALE_TEST=Test
-TOOLTIP_WSWSCEN_SCALE_SERVICE=Move the slider to set the level of service generation.
-TOOLTIP_WSWSCEN_SCALE_CLIENT=Move the slider to set the level of client generation. Service must be started to enable client generation.
-TOOLTIP_WSWSCEN_SCALE_CLIENT_ONLY=Move the slider to set the level of client generation.
-TOOLTIP_WSWSCEN_TEXT_IMPL=Implementation for the web service.
-TOOLTIP_WSWSCEN_BUTTON_BROWSE_IMPL=Browse implementation files for specified service type.
-TOOLTIP_WSWSCEN_BUTTON_OVERWRITE_FILES=Existing files will be overwritten with no warning during generation.
-
-#
-# Tooltips for beans.WebServiceBeanClassPage
-#
-TOOLTIP_PBCL_PAGE=
-TOOLTIP_PBCL_TEXT_BEAN_CLASS=Selected Java bean.
-TOOLTIP_PBCL_BUTTON_BEAN_CLASS_BROWSE=Browse classes.
-TOOLTIP_PBCL_BUTTON_BEAN_RESOURCE_BROWSE=Browse Java files.
-
-#
-# Tooltips for beans.WebServiceTestPage
-#
-TOOLTIP_PSTP_COMBOBOX_TEST=Test facilities available to test the service.
-TOOLTIP_PSTP_LAUNCH_BUTTON=Launch the selected test facility.
-
-#
-# Tooltips for WebServiceRuntimeSelectionPage
-#
-TOOLTIP_PWRS_PAGE=
-TOOLTIP_PWRS_LIST_RUNTIMES=Select from the following deployment runtime(s).
-TOOLTIP_PWRS_LIST_SERVERS=Select from application server(s).
-TOOLTIP_PWRS_RADIO_SERVER=Server oriented selection.
-TOOLTIP_PWRS_RADIO_RUNTIME=Runtime oriented selection.
-TOOLTIP_PWRS_RADIO_EXPLORE=Explore combinations.
-
-#
-# Tooltips for WebServiceClientRuntimeSelectionPage
-#
-TOOLTIP_PWCR_COMBO_CLIENT_TYPE=Client project type.
-TOOLTIP_PWCR_COMBO_SERVICE_TYPE=Service project type.
-
-#
-# Tooltips for WebServiceProjectPage
-#
-TOOLTIP_PWPR_COMBO_TYPE=Web service implementation type.
-TOOLTIP_PWPR_GROUP_SCENARIO_SERVICE=Service defaults for this wizard scenario.
-TOOLTIP_PWPR_CHECKBOX_GENERATE_PROXY=Enable/disable proxy generation for this scenario.
-TOOLTIP_PWPR_CHECKBOX_START_WEB_PROJECT=Start Web service in Web project for this scenario.
-TOOLTIP_PWPR_CHECKBOX_INSTALL_SERVICE_WEB_PROJECT=Install the Web service on the server for this scenario.
-TOOLTIP_PWPR_CHECKBOX_INSTALL_CLIENT_WEB_PROJECT=Install the Web service client on the server for this scenario (managed client only).
-TOOLTIP_PWPR_CHECKBOX_LAUNCH_WS=Launch the Web Services Explorer to publish the Web service in this scenario to a UDDI Registry.
-TOOLTIP_PWPR_CHECKBOX_TEST_SERVICE=Select this to explore the Web service created.
-TOOLTIP_PWPR_CHECKBOX_MONITOR_SERVICE=Select this to monitor the SOAP traffic of this Web service.
-TOOLTIP_PWPR_GROUP_SCENARIO_CLIENT=Client proxy defaults for this wizard scenario.
-TOOLTIP_PWPR_COMBO_CLIENTTYPE=Client proxy selection type.
-
-#
-# Tooltips for WebServicePublishPage
-#
-TOOLTIP_PWPB_PAGE=
-TOOLTIP_PWPB_CHECKBOX_WS_LAUNCH=Publish the Web service.
-
-#
-# WSIL proxy
-#
-PAGE_WSIL_IMPORT=WSIL Import Page
-TITLE_WSIL_IMPORT=WSIL Import
-DESC_WSIL_IMPORT=Import WSDL references to a WSIL document
-PAGE_TITLE_WS_SELECTION=Web Service Selection Page
-PAGE_DESC_WS_SELECTION=Enter a web service URI.
-
-PAGE_MSG_LOADING_WEB_SERVICE_URI=Loading Web service URI...
-PAGE_MSG_INVALID_WEB_SERVICE_URI=Invalid Web service URI. Enter a URI to a WSDL, WSIL or HTML document.
-PAGE_MSG_NO_SUCH_FILE=File "{0}" does not exist.
-PAGE_MSG_SELECTION_MUST_BE_WSDL=Selection must be WSDL.
-PAGE_MSG_INVALID_WSIL_FILE_NAME=Invalid WSIL file name. WSIL file name must end with .wsil
-
-MSG_ERROR_URI_NOT_RESOLVABLE=IWAB0469E "{0}" is not resolvable.
-MSG_ERROR_WSDL_HAS_NO_SERVICE_ELEMENT=IWAB0551E WSDL file at {0} has no service element.
-
-LABEL_WSIL_URI=WSIL URI:
-LABEL_BROWSE=Browse
-LABEL_WSDL=WSDL:
-LABEL_WSDL_URI=WSDL URI
-LABEL_IMPORT=Import...
-LABEL_ADD=Add
-LABEL_REMOVE=Remove
-LABEL_WS_SELECTION=Enter a URI to a WSDL, WSIL or HTML document:
-LABEL_SELECT_WSDL=Select a WSDL
-LABEL_VALIDATE_MESSAGES=WSDL validation messages:
-
-TOOLTIP_WSIL_IMPORT_PAGE=This page allows you to add WSDL references to a WSIL document.
-TOOLTIP_WSIL_TEXT_WSIL=Enter the location of a new or existing WSIL document.
-TOOLTIP_WSIL_BUTTON_BROWSE_WSIL=Browse for a WSIL document.
-TOOLTIP_WSIL_TABLE_WSDL=Enter the URIs of the WSDLs that are going to be added as service references.
-TOOLTIP_PCON_PAGE=Select a web service for consumption.
-TOOLTIP_PCON_TEXT_WS=Enter a URI to a WSDL, WSIL or HTML document.
-TOOLTIP_PCON_BUTTON_BROWSE_WS=Browse for a web service resource.
-TOOLTIP_VALIDATE_TEXT_MESSAGE=Messages from WSDL validation.
-TOOLTIP_TABLE_VALIDATE_MESSAGE=Use the Web Service Profile Compliance and Validation preference to enable or disable WSDL validation.
-
-#
-# Table column heading for ValidationMessageViewerWidget
-#
-TABLE_COLUMN_VALIDATION_SEVERITY=Severity
-TABLE_COLUMN_VALIDATION_LINE=Line
-TABLE_COLUMN_VALIDATION_COLUMN=Column
-TABLE_COLUMN_VALIDATION_MESSAGE=Message
-#
-# Tooltips for client.WebServiceClienTestPage
-#
-TOOLTIP_PWSM_PAGE=
-TOOLTIP_PWSM_CHECKBOX_TEST=Enable/disable Test.
-TOOLTIP_PWSM_COMBOBOX_TEST=Select the test type.
-TOOLTIP_PWSM_COMBOBOX_SERVER=Select the server type.
-TOOLTIP_PWSM_COMBOBOX_SERVER_INSTANCE=Select the server instance.
-TOOLTIP_PWSM_CHECKBOX_LAUNCH=Run test on a server.
-TOOLTIP_PWSM_TEXT_JSP_FOLDER=Destination folder of generated sample files.
-TOOLTIP_PWSM_BUTTON_JSP_FOLDER_BROWSE=Browse folders.
-TOOLTIP_PWSM_BUTTON_SELECT_ALL=Select all methods.
-TOOLTIP_PWSM_BUTTON_DESELECT_ALL=Deselect all methods.
-TOOLTIP_PWSM_COMBO_PROJECT=Web project for generated sample.
-TOOLTIP_PWSM_TEXT_SAMPLE_FOLDER=Destination folder of generated sample files.
-TOOLTIP_PWSM_TREE_METHODS=Methods to generate into the sample.
-TOOLTIP_PWSM_EAR_PROJECT=EAR project for the generated sample.
-
-#
-# HTTP Basic Auth
-#
-DIALOG_TITLE_HTTP_BASIC_AUTH=HTTP Basic Authentication
-LABEL_URL=URL:
-LABEL_HTTP_BASIC_AUTH_USERNAME=User name:
-LABEL_HTTP_BASIC_AUTH_PASSWORD=Password:
-
-TOOLTIP_HTTP_BASIC_AUTH_USERNAME=Enter your HTTP basic authentication user name.
-TOOLTIP_HTTP_BASIC_AUTH_PASSWORD=Enter your HTTP basic authentication password.
-
-#
-# Generate Handler Skeleton
-#
-MSG_ERROR_GENERATE_HANDLER_SKELETON=IWAB0359E Error in generating handler skeleton.
-MSG_ERROR_WRITE_FILE=IWAB0360E Error in writing file {0}.
-
-#
-# Handlers Configuration wizard page
-#
-LABEL_HANDLERS_CONFIG=Handler configuration
-LABEL_BUTTON_ADD=Add
-LABEL_BUTTON_REMOVE=Remove
-LABEL_BUTTON_MOVE_UP=Move up
-LABEL_BUTTON_MOVE_DOWN=Move down
-LABEL_BUTTON_GEN_SKELETON=Generate skeleton classes for new handlers
-LABEL_COMBO_SOURCE_LOC=Output folder:
-LABEL_COMBO_WS_CLIENT_REF=Client Service References:
-LABEL_COMBO_WS_SERVICE_DESC=Service Descriptions:
-MSG_TEXT_NUM_OF_SERVICES=You have selected {0} services.
-MSG_TEXT_NUM_OF_CLIENTS=You have selected {0} client services.
-
-LABEL_HANDLER_NAME=Name
-LABLE_HANDLER_CLASS=Class name
-LABEL_HANDLER_PORT=Port name
-
-DIALOG_TITLE_WS_ADD_HANDLER=Add New Handler
-LABEL_TEXT_HANDLER_NAME=Name:
-LABEL_TEXT_HANDLER_CLASS=Class name:
-LABEL_TEXT_HANDLER_PORT=Port name:
-
-PAGE_TITLE_SERVICE_HDLR_CONFIG=Service Handlers Configuration
-PAGE_DESC_SERVICE_HDLR_CONFIG=Configure service-side handlers
-PAGE_TITLE_CLIENT_HDLR_CONFIG=Client Handlers Configuration
-PAGE_DESC_CLIENT_HDLR_CONFIG=Configure client-side handlers
-PAGE_DESC_MULTIPLE_SERVICES_CONFIG=Add handlers to multiple Web services.
-PAGE_DESC_MULTIPLE_CLIENTS_CONFIG=Add handlers to multiple Web service clients.
-
-TOOLTIP_EDIT_WS_HANDLERS=Configure Web Service Handlers
-TOOLTIP_BUTTON_GEN_SKELETON=Select to generate skeleton classes for new handlers.
-TOOLTIP_COMBO_SOURCE_LOC=Select the output location for file generation.
-TOOLTIP_TEXT_HANDLER_NAME=Handler name
-TOOLTIP_TEXT_HANDLER_CLASS=Handler class name
-TOOLTIP_TEXT_HANDLER_PORT=Handler port component name
-TOOLTIP_WS_CLIENT_REF=Select a client service-reference to show its handlers.
-TOOLTIP_WS_SERVICE_DESC=Select a service description to show its handlers.
-
-#
-# ClientHandlersWidgetDefaultingCommand
-#
-MSG_ERROR_WEB_SERVICE_CLIENTS_NOT_FOUND=No Web service clients were found. Create a Web service client before configuring Web service client handlers.
-
-#
-# ServiceHandlersWidgetDefaultingCommand
-#
-MSG_ERROR_WEB_SERVICES_NOT_FOUND=No Web services were found. Create a Web service before configuring Web service handlers.
-MSG_ERROR_WSDD_NOT_FOUND=Unable to launch handler wizard. No deployment descriptor was found for this Web service.
-MSG_ERROR_INVALID_MULTIPLE_SERVICE_SELECT=Invalid multiple selection of Services. Ensure all selections are Services.#
-
-# OpenJavaEditorCommand
-#
-MSG_ERROR_UNABLE_TO_OPEN_JAVA_EDITOR=IWAB0029E Unable to open class {0} from project {1} in the Java editor.
-
-#
-# CheckIfServiceProject
-#
-MSG_WARN_IS_SERVICE_PROJECT=The selected client project, {0}, contains the Web service. Proceeding with this configuration may result in runtime errors when invoking the Web service. Would you like to proceed?
-MSG_USER_ABORTED=User pressed cancel in warning dialog which warned about the selected client project being the service project.
-
-#
-# Missing third party file error message
-#
-MSG_MISSING_THIRD_PARTY_FILES=Missing third party files. Refer to http://www.eclipse.org/webtools/wst/components/ws/download_instructions_for_jars.html
-
-#
-# WSDLSelectionOutputCommand
-#
-MSG_WARNING_NO_SERVICE_ELEMENT=The WSDL file does not contain a Service element. Therefore a service interface and Java proxy will not be generated and as a result, a Java test client will not be launched. Click OK to proceed, or click Cancel to select another WSDL file. Alternately, exit the wizard and use the WSDL editor to create a Service WSDL document.
-
-#
-# CheckWSDLValidationCommand
-#
-STILL_VALIDATING_WSDL=Wizard WSDL validation in Progress. \n- Click Cancel to cancel the current WSDL validation and continue. \n- Click Cancel and Update to update the preference to always cancel incomplete WSDL validation while traversing the wizard. \n- Click Wait to wait for WSDL validation to complete.
-CANCEL_VALIDATION_LABEL=Cancel
-CANCEL_VALIDATION_DESCRIPTION=Cancel the current WSDL validation and continue
-CANCEL_ALL_VALIDATION_LABEL=Cancel and Update
-CANCEL_ALL_VALIDATION_DESCRIPTION=Update the preference to always cancel incomplete WSDL validation while traversing the wizard.
-WAIT_VALIDATION_LABEL=Wait
-WAIT_VALIDATION_DESCRIPTION=Wait for WSDL validation to complete
-TASK_LABEL_CHECK_WSDL_VALIDATION=Check for WSDL validation
-TASK_DESC_CHECK_WSDL_VALIDATION=Check if WSDL validation has completed
-
-#
-# WSDLValidation messages
-#
-MESSAGE_VALIDATE_NO_WSDL=Wizard WSDL validation is disabled.
-MESSAGE_VALIDATE_REMOTE_WSDL=Wizard WSDL validation is only enabled for remote files.
-MESSAGE_VALIDATE_ALL_WSDL=Wizard WSDL validation is enabled.
-MESSAGE_VALIDATE_IN_PROGRESS=WSDL validation in progress ...
-ERROR_MESSAGES_IN_VALIDATION=The WSDL file contains validation error(s).
-WARNING_MESSAGES_IN_VALIDATION=The WSDL file contains validation warning(s).
-WARNING_IF_CONTINUE=Continuing with the wizard may result in generation or runtime problem.
-VALIDATION_COMPLETED=WSDL validation completes with no warning or error.
-TOOLTIP_VALIDATE_TEXT_MESSAGE_SUMMARY=WSDL validation preference can be changed using the Web Services Profile Compliance and Validation preference.
-
-LABEL_BUTTON_STOP_WSDL_VALIDATION=Stop Validation
-TOOLTIP_STOP_VALIDATION_BUTTON=Stops the current WSDL validation operation.
-
-
-#
-# Start server page
-#
-PAGE_TITLE_WS_START_SERVER=Server startup
-PAGE_DESC_WS_START_SERVER=Start the server from this page.
-LABEL_START_SERVER_TEXT1=In order to proceed the server "{0}" must be started.
-LABEL_START_SERVER_TEXT2=Once the server is started the "next" button will be enabled.
-LABEL_START_SERVER_TEXT3=The "back" button can be used while the server is starting to
-LABEL_START_SERVER_TEXT4=change any previous settings in this wizard.
-LABEL_START_SERVER_BUTTON=&Start server
-TOOLTIP_START_SERVER_BUTTON=Start the server
-TEXT_SERVER_STATUS=Currently the server is {0}.
-TEXT_SERVER_MSG=Server {0}
-TEXT_SERVER_STARTED=started
-TEXT_SERVER_STARTING=starting
-TEXT_SERVER_STOPPED=stopped
-
-#
-# Warnings
-#
-
-MSG_SERVER_NOT_FOUND_WARNING=A suitable server was not found. The sample can be generated but cannot be launched.
-
-
-#
-# Ant task List options
-#
-
-# Note to translation do not translate keyword RuntimeId
-MSG_INFO_ANT_RUNTIME_HEADING=Web Service Runtime IDs (RuntimeId)
-MSG_INFO_ANT_SERVER_RUNTIME=Server runtime: {0}
-MSG_INFO_ANT_CLIENT_RUNTIME=Client runtime: {0}
-
-# Note to translation do not translate keyword ServerId
-MSG_INFO_ANT_SERVER_HEADING=Server IDs (ServerId)
-MSG_INFO_ANT_SERVER=Server: {0}
-
-MSG_INFO_WSDL_OPERATION_TIMED_OUT=Could not retrieve the WSDL file {0}. Do you want to continue to wait for this file?
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/ConsumptionUIMessages.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/ConsumptionUIMessages.java
deleted file mode 100644
index 7259339..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/ConsumptionUIMessages.java
+++ /dev/null
@@ -1,412 +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
- * -------- -------- -----------------------------------------------------------
- * 20060204 124143 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060204 124408 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060329 128069 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060404 134913 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060411 136134 kathy@ca.ibm.com - Kathy Chan
- * 20060417 136390/136159 joan@ca.ibm.com - Joan Haggarty
- * 20060413 135581 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060418 136335 joan@ca.ibm.com - Joan Haggarty
- * 20060420 136158 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060420 120714 kathy@ca.ibm.com - Kathy Chan
- * 20060420 135912 joan@ca.ibm.com - Joan Haggarty
- * 20060426 138647 joan@ca.ibm.com - Joan Haggarty
- * 20060510 141115 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060509 119296 pmoogk@ca.ibm.com - Peter Moogk
- * 20060719 139977 kathy@ca.ibm.com - Kathy Chan
- * 20071031 140518 joan@ca.ibm.com - Joan Haggarty
- * 20080318 213330 trungha@ca.ibm.com - Trung, Non-conventional Java naming prevents creating Web Services (client)
- * 20080326 171705 trungha@ca.ibm.com - Trung, improve AntTask errors report
- * 20080325 184761 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080416 215084 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080425 221232 gilberta@ca.ibm.com - Gilbert Andrews
- * 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.consumption.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class ConsumptionUIMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUI";//$NON-NLS-1$
-
- private ConsumptionUIMessages() {
- // Do not instantiate
- }
-
- public static String PLUGIN_NEW_WIZARD_NAME_WS_CLIENT;
- public static String ACTION_GENERATE_JAVA_PROXY;
- public static String CHECKBOX_SHOW_GENERATE_JAVA_PROXY_DIALOG;
- public static String TOOLTIP_PPAD_CHECKBOX_WSDL2PROXY;
- public static String TOOLTIP_SRPF_COMBO_SERVER;
- public static String TOOLTIP_SRPF_COMBO_RUNTIME;
- public static String TOOLTIP_SRPF_COMBO_J2EE;
- public static String MSG_ERROR_TASK_EXCEPTED;
- public static String MSG_ERROR_NO_SERVER_RUNTIME;
- public static String MSG_ERROR_NO_SERVER_RUNTIME_INSTALLED;
- public static String LABEL_FOLDER_NAME;
- public static String LABEL_JSP_FOLDER_NAME;
- public static String LABEL_WEB_PROJECT_NAME;
- public static String LABEL_WEBSERVICETYPE;
- public static String LABEL_WEBSERVICEIMPL;
- public static String LABEL_WEBSERVICEDEF;
- public static String LABEL_J2EE_VERSION;
- public static String LABEL_NA;
- public static String BUTTON_BROWSE;
- public static String BUTTON_BROWSE_FILES;
- public static String BOTTOMUP_LABEL;
- public static String TOPDOWN_LABEL;
- public static String CLIENT_LABEL;
- public static String COMBINED_TYPE_AND_RUNTIME_LABEL;
- public static String WIZARD_TITLE_WSC;
- public static String PAGE_TITLE_WS_PROJECT;
- public static String PAGE_DESC_WS_SERVICE;
- public static String PAGE_DESC_WS_CLIENT;
- public static String BUTTON_START_WEB_PROJECT;
- public static String BUTTON_INSTALL_SERVICE_WEB_PROJECT;
- public static String BUTTON_INSTALL_CLIENT_WEB_PROJECT;
- public static String GROUP_SCENARIO_SERVICE;
- public static String GROUP_SCENARIO_CLIENT;
- public static String LABEL_WEBSERVICECLIENTTYPE;
- public static String PAGE_TITLE_WS_RUNTIME_SELECTION;
- public static String PAGE_DESC_WS_RUNTIME_SELECTION;
- public static String LABEL_SUMMARY;
- public static String LABEL_SUMMARY_NO_CLIENT;
- public static String LABEL_RUNTIMES_LIST;
- public static String LABEL_SERVERS_LIST;
- public static String LABEL_SERVERS_INSTANCES;
- public static String LABEL_EDIT_BUTTON;
- public static String LABEL_SERVICE_EAR_MODULE;
- public static String LABEL_CLIENT_EAR_MODULE;
- public static String LABEL_CLIENT_MODULE;
- public static String LABEL_SERVICE_MODULE;
- public static String LABEL_CLIENT_PROJECT;
- public static String LABEL_SERVICE_PROJECT;
- public static String LABEL_CLIENT_EAR_PROJECT;
- public static String LABEL_SERVICE_EAR_PROJECT;
- public static String LABEL_CLIENT_COMP_TYPE_WEB;
- public static String LABEL_CLIENT_COMP_TYPE_EJB;
- public static String LABEL_CLIENT_COMP_TYPE_APP_CLIENT;
- public static String LABEL_CLIENT_COMP_TYPE_CONTAINERLESS;
- public static String TOOLTIP_PWRS_TEXT_RUNTIME;
- public static String TOOLTIP_PWRS_TEXT_SERVER;
- public static String TOOLTIP_PWRS_J2EE_VERSION;
- public static String LABEL_SELECTION_VIEW_TITLE;
- public static String LABEL_SELECTION_VIEW_RUNTIME;
- public static String LABEL_SELECTION_VIEW_SERVER;
- public static String LABEL_SELECTION_VIEW_EXPLORE;
- public static String LABEL_TREE_EXISTING_SERVERS;
- public static String LABEL_TREE_SERVER_TYPES;
- public static String MSG_NO_OBJECT_SELECTION;
- public static String MSG_NO_SERVICE_SELECTION;
- public static String MSG_INVALID_SERVICE_DEF;
- public static String MSG_INVALID_SERVICE_IMPL;
- public static String MSG_INVALID_SRT_SELECTIONS;
- public static String MSG_WARN_SERVICE_IMPL_NAMING_CONVENTION;
- public static String MSG_NO_RUNTIME;
- public static String MSG_NO_SERVER;
- public static String MSG_ERROR_STUB_ONLY;
- public static String MSG_WARN_STUB_ONLY;
- public static String MSG_WARN_NO_SERVICE_SERVER;
- public static String MSG_WARN_NO_CLIENT_SERVER;
- public static String MSG_SERVER_TARGET_MISMATCH;
- public static String MSG_J2EE_MISMATCH;
- public static String MSG_SERVICE_PROJECT_EMPTY;
- public static String MSG_SERVICE_PROJECT_TYPE_EMPTY;
- public static String MSG_SERVICE_EAR_EMPTY;
- public static String MSG_CLIENT_PROJECT_EMPTY;
- public static String MSG_CLIENT_PROJECT_TYPE_EMPTY;
- public static String MSG_CLIENT_EAR_EMPTY;
- public static String MSG_INVALID_EJB_PROJECT;
- public static String MSG_INVALID_WEB_PROJECT;
- public static String MSG_INVALID_PROJECT_TYPE;
- public static String MSG_MODULE;
- public static String MSG_MODULE_NAME_AND_PROJECT_NAME_NOT_THE_SAME;
- public static String MSG_SERVICE_RUNTIME_DOES_NOT_SUPPORT_PROJECT;
- public static String MSG_SERVICE_SERVER_DOES_NOT_SUPPORT_JAVAPROJECT;
- public static String MSG_SERVICE_SERVER_DOES_NOT_SUPPORT_PROJECT;
- public static String MSG_SERVICE_RUNTIME_DOES_NOT_SUPPORT_TEMPLATE;
- public static String MSG_SERVICE_SERVER_DOES_NOT_SUPPORT_TEMPLATE;
- public static String MSG_CLIENT_RUNTIME_DOES_NOT_SUPPORT_PROJECT;
- public static String MSG_CLIENT_SERVER_DOES_NOT_SUPPORT_PROJECT;
- public static String MSG_CLIENT_RUNTIME_DOES_NOT_SUPPORT_TEMPLATE;
- public static String MSG_CLIENT_SERVER_DOES_NOT_SUPPORT_TEMPLATE;
- public static String MSG_SAME_CLIENT_AND_SERVICE_EARS;
- public static String MSG_SAME_CLIENT_AND_SERVICE_COMPONENTS;
- public static String MSG_SAME_CLIENT_AND_SERVICE_PROJECTS;
- public static String MSG_WRONG_CLIENT_PROJECT_TYPE;
- public static String MSG_CLIENT_SUB;
- public static String MSG_SERVICE_SUB;
- public static String MSG_GENERAL_PROJECT_AND_EAR;
- public static String MSG_EAR_PROJECT_WILL_BE_CREATED;
- public static String MSG_EAR_WILL_BE_ASSOCIATED;
- public static String MSG_PROJECT_WILL_BE_CREATED;
- public static String MSG_EAR_WILL_BE_CREATED;
- public static String MSG_PROJECT_AND_EAR_CREATED;
- public static String PAGE_TITLE_WS_CLIENT_RUNTIME_SELECTION;
- public static String PAGE_DESC_WS_CLIENT_RUNTIME_SELECTION;
- public static String LABEL_CLIENT_SELECTION_VIEW_TITLE;
- public static String LABEL_CLIENT_TYPE;
- public static String LABEL_SERVICE_TYPE;
- public static String LABEL_WEB;
- public static String LABEL_EJB;
- public static String LABEL_NO_LABEL;
- public static String PAGE_MSG_VALIDATION_INTERNAL_ERROR;
- public static String PAGE_TITLE_WS_XML2BEAN;
- public static String PAGE_DESC_N2P_MAPPINGS;
- public static String MSG_MAPPING_DUPLICATE_ENTRIES;
- public static String BUTTON_GENERATE_PROXY;
- public static String PAGE_DESC_WSSKEL_CONFIG;
- public static String PAGE_TITLE_WSSKEL_CONFIG;
- public static String TOOLTIP_PBSC_TEXT_SKELETON_FOLDER;
- public static String TOOLTIP_PBSC_BUTTON_SKELETON_FOLDER_BROWSE;
- public static String LABEL_SKELETON_ROOT_NAME;
- public static String LABEL_BEAN_CLASS_NAME;
- public static String PAGE_MSG_BEAN_CANNOT_BE_EMPTY;
- public static String BUTTON_BROWSE_CLASSES;
- public static String PAGE_TITLE_WSTEST;
- public static String PAGE_DESC_WSTEST;
- public static String CHECKBOX_TEST_WEBSERVICE;
- public static String CHECKBOX_MONITOR_WEBSERVICE;
- public static String MSG_ERROR_UNABLE_TO_LAUNCH_WSDL_TEST;
- public static String BUTTON_LAUNCH_SERVICE_TEST;
- public static String PAGE_TITLE_WS_SAMPLE;
- public static String PAGE_DESC_WS_SAMPLE;
- public static String BUTTON_TEST;
- public static String LABEL_TEST_TYPES;
- public static String BUTTON_RUN_TEST;
- public static String LABEL_METHODS;
- public static String LABEL_JSP_PROJECT_NAME;
- public static String MSG_ERROR_JTS_PROXY_NOT_COMPILED;
- public static String MSG_ERROR_MALFORMED_URL;
- public static String BUTTON_SELECT_ALL;
- public static String BUTTON_DESELECT_ALL;
- public static String TOOLTIP_PBME_BUTTON_SELECT_ALL;
- public static String TOOLTIP_PBME_BUTTON_DESELECT_ALL;
- public static String PAGE_TITLE_WSDL_SELECTION;
- public static String PAGE_DESC_WSDL_SELECTION;
- public static String PAGE_TITLE_WS_PUBLISH;
- public static String PAGE_DESC_WS_PUBLISH;
- public static String PAGE_TITLE_WS_FIND;
- public static String PAGE_DESC_WS_FIND;
- public static String BUTTON_WS_PUBLISH;
- public static String BUTTON_WSWSCEN_PUBLISH;
- public static String BUTTON_WS_PUBLISH_PRIVATE_UDDI;
- public static String BUTTON_WS_FIND;
- public static String BUTTON_WS_FIND_PRIVATE_UDDI;
- public static String LABEL_PUBLIC_UDDI_REGISTRIES;
- public static String LABEL_EJB_BEAN_NAME;
- public static String TABLE_TITLE_EJB_BEAN_NAMES;
- public static String TABLE_TITLE_EJB_PROJECT_NAME;
- public static String LABEL_EAR_PROJECTS;
- public static String LABEL_SHOW_ALL_STATELESS_SESSION_EJBS;
- public static String CHECKBOX_OVERWRITE_FILES;
- public static String DIALOG_TITILE_SERVICE_PROJECT_SETTINGS;
- public static String DIALOG_TITILE_CLIENT_PROJECT_SETTINGS;
- public static String DIALOG_TITILE_SERVICE_IMPL_SELECTION;
- public static String DIALOG_TITILE_SERVICE_DEF_SELECTION;
- public static String TOOLTIP_WSWSCEN_SERVICEPROJECT_LINK;
- public static String TOOLTIP_WSWSCEN_CLIENTPROJECT_LINK;
- public static String TOOLTIP_WSWSCEN_SCALE_DEVELOP;
- public static String TOOLTIP_WSWSCEN_SCALE_ASSEMBLE;
- public static String TOOLTIP_WSWSCEN_SCALE_DEPLOY;
- public static String TOOLTIP_WSWSCEN_SCALE_INSTALL;
- public static String TOOLTIP_WSWSCEN_SCALE_RUN;
- public static String TOOLTIP_WSWSCEN_SCALE_TEST;
- public static String TOOLTIP_WSWSCEN_SCALE_SERVICE;
- public static String TOOLTIP_WSWSCEN_SCALE_CLIENT;
- public static String TOOLTIP_WSWSCEN_SCALE_CLIENT_ONLY;
- public static String TOOLTIP_WSWSCEN_TEXT_IMPL;
- public static String TOOLTIP_WSWSCEN_BUTTON_OVERWRITE_FILES;
- public static String TOOLTIP_WSWSCEN_BUTTON_BROWSE_IMPL;
- public static String TOOLTIP_EAR_PROJECTS;
- public static String TOOLTIP_TABLE_BEAN_NAMES;
- public static String TOOLTIP_PWWS_PAGE;
- public static String TOOLTIP_PBCL_PAGE;
- public static String TOOLTIP_PBCL_TEXT_BEAN_CLASS;
- public static String TOOLTIP_PBCL_BUTTON_BEAN_CLASS_BROWSE;
- public static String TOOLTIP_PBCL_BUTTON_BEAN_RESOURCE_BROWSE;
- public static String TOOLTIP_PSTP_COMBOBOX_TEST;
- public static String TOOLTIP_PSTP_LAUNCH_BUTTON;
- public static String TOOLTIP_PWRS_PAGE;
- public static String TOOLTIP_PWRS_LIST_RUNTIMES;
- public static String TOOLTIP_PWRS_LIST_SERVERS;
- public static String TOOLTIP_PWRS_RADIO_SERVER;
- public static String TOOLTIP_PWRS_RADIO_RUNTIME;
- public static String TOOLTIP_PWRS_RADIO_EXPLORE;
- public static String TOOLTIP_PWCR_COMBO_CLIENT_TYPE;
- public static String TOOLTIP_PWCR_COMBO_SERVICE_TYPE;
- public static String TOOLTIP_PWPR_COMBO_TYPE;
- public static String TOOLTIP_PWPR_GROUP_SCENARIO_SERVICE;
- public static String TOOLTIP_PWPR_CHECKBOX_GENERATE_PROXY;
- public static String TOOLTIP_PWPR_CHECKBOX_START_WEB_PROJECT;
- public static String TOOLTIP_PWPR_CHECKBOX_INSTALL_SERVICE_WEB_PROJECT;
- public static String TOOLTIP_PWPR_CHECKBOX_INSTALL_CLIENT_WEB_PROJECT;
- public static String TOOLTIP_PWPR_CHECKBOX_LAUNCH_WS;
- public static String TOOLTIP_PWPR_CHECKBOX_TEST_SERVICE;
- public static String TOOLTIP_PWPR_CHECKBOX_MONITOR_SERVICE;
- public static String TOOLTIP_PWPR_GROUP_SCENARIO_CLIENT;
- public static String TOOLTIP_PWPR_COMBO_CLIENTTYPE;
- public static String TOOLTIP_PWPB_PAGE;
- public static String TOOLTIP_PWPB_CHECKBOX_WS_LAUNCH;
- public static String PAGE_WSIL_IMPORT;
- public static String TITLE_WSIL_IMPORT;
- public static String DESC_WSIL_IMPORT;
- public static String PAGE_TITLE_WS_SELECTION;
- public static String PAGE_DESC_WS_SELECTION;
- public static String PAGE_MSG_LOADING_WEB_SERVICE_URI;
- public static String PAGE_MSG_INVALID_WEB_SERVICE_URI;
- public static String PAGE_MSG_NO_SUCH_FILE;
- public static String PAGE_MSG_SELECTION_MUST_BE_WSDL;
- public static String PAGE_MSG_INVALID_WSIL_FILE_NAME;
- public static String MSG_ERROR_URI_NOT_RESOLVABLE;
- public static String MSG_ERROR_WSDL_HAS_NO_SERVICE_ELEMENT;
- public static String LABEL_WSIL_URI;
- public static String LABEL_BROWSE;
- public static String LABEL_WSDL;
- public static String LABEL_WSDL_URI;
- public static String LABEL_IMPORT;
- public static String LABEL_ADD;
- public static String LABEL_REMOVE;
- public static String LABEL_WS_SELECTION;
- public static String LABEL_SELECT_WSDL;
- public static String LABEL_VALIDATE_MESSAGES;
- public static String TOOLTIP_WSIL_IMPORT_PAGE;
- public static String TOOLTIP_WSIL_TEXT_WSIL;
- public static String TOOLTIP_WSIL_BUTTON_BROWSE_WSIL;
- public static String TOOLTIP_WSIL_TABLE_WSDL;
- public static String TOOLTIP_PCON_PAGE;
- public static String TOOLTIP_PCON_TEXT_WS;
- public static String TOOLTIP_PCON_BUTTON_BROWSE_WS;
- public static String TOOLTIP_VALIDATE_TEXT_MESSAGE;
- public static String TOOLTIP_TABLE_VALIDATE_MESSAGE;
- public static String TABLE_COLUMN_VALIDATION_SEVERITY;
- public static String TABLE_COLUMN_VALIDATION_LINE;
- public static String TABLE_COLUMN_VALIDATION_COLUMN;
- public static String TABLE_COLUMN_VALIDATION_MESSAGE;
- public static String TOOLTIP_PWSM_PAGE;
- public static String TOOLTIP_PWSM_CHECKBOX_TEST;
- public static String TOOLTIP_PWSM_COMBOBOX_TEST;
- public static String TOOLTIP_PWSM_COMBOBOX_SERVER;
- public static String TOOLTIP_PWSM_COMBOBOX_SERVER_INSTANCE;
- public static String TOOLTIP_PWSM_CHECKBOX_LAUNCH;
- public static String TOOLTIP_PWSM_TEXT_JSP_FOLDER;
- public static String TOOLTIP_PWSM_BUTTON_JSP_FOLDER_BROWSE;
- public static String TOOLTIP_PWSM_BUTTON_SELECT_ALL;
- public static String TOOLTIP_PWSM_BUTTON_DESELECT_ALL;
- public static String TOOLTIP_PWSM_COMBO_PROJECT;
- public static String TOOLTIP_PWSM_TEXT_SAMPLE_FOLDER;
- public static String TOOLTIP_PWSM_TREE_METHODS;
- public static String TOOLTIP_PWSM_EAR_PROJECT;
- public static String DIALOG_TITLE_HTTP_BASIC_AUTH;
- public static String LABEL_URL;
- public static String LABEL_HTTP_BASIC_AUTH_USERNAME;
- public static String LABEL_HTTP_BASIC_AUTH_PASSWORD;
- public static String TOOLTIP_HTTP_BASIC_AUTH_USERNAME;
- public static String TOOLTIP_HTTP_BASIC_AUTH_PASSWORD;
- public static String MSG_ERROR_GENERATE_HANDLER_SKELETON;
- public static String MSG_ERROR_WRITE_FILE;
- public static String LABEL_HANDLERS_CONFIG;
- public static String LABEL_BUTTON_ADD;
- public static String LABEL_BUTTON_REMOVE;
- public static String LABEL_BUTTON_MOVE_UP;
- public static String LABEL_BUTTON_MOVE_DOWN;
- public static String LABEL_BUTTON_GEN_SKELETON;
- public static String LABEL_COMBO_SOURCE_LOC;
- public static String LABEL_COMBO_WS_CLIENT_REF;
- public static String LABEL_COMBO_WS_SERVICE_DESC;
- public static String MSG_TEXT_NUM_OF_SERVICES;
- public static String MSG_TEXT_NUM_OF_CLIENTS;
- public static String LABEL_HANDLER_NAME;
- public static String LABLE_HANDLER_CLASS;
- public static String LABEL_HANDLER_PORT;
- public static String DIALOG_TITLE_WS_ADD_HANDLER;
- public static String LABEL_TEXT_HANDLER_NAME;
- public static String LABEL_TEXT_HANDLER_CLASS;
- public static String LABEL_TEXT_HANDLER_PORT;
- public static String PAGE_TITLE_SERVICE_HDLR_CONFIG;
- public static String PAGE_DESC_SERVICE_HDLR_CONFIG;
- public static String PAGE_TITLE_CLIENT_HDLR_CONFIG;
- public static String PAGE_DESC_CLIENT_HDLR_CONFIG;
- public static String PAGE_DESC_MULTIPLE_SERVICES_CONFIG;
- public static String PAGE_DESC_MULTIPLE_CLIENTS_CONFIG;
- public static String TOOLTIP_EDIT_WS_HANDLERS;
- public static String TOOLTIP_BUTTON_GEN_SKELETON;
- public static String TOOLTIP_COMBO_SOURCE_LOC;
- public static String TOOLTIP_TEXT_HANDLER_NAME;
- public static String TOOLTIP_TEXT_HANDLER_CLASS;
- public static String TOOLTIP_TEXT_HANDLER_PORT;
- public static String TOOLTIP_WS_CLIENT_REF;
- public static String TOOLTIP_WS_SERVICE_DESC;
- public static String MSG_ERROR_UNABLE_TO_OPEN_JAVA_EDITOR;
- public static String MSG_WARN_IS_SERVICE_PROJECT;
- public static String MSG_USER_ABORTED;
- public static String MSG_MISSING_THIRD_PARTY_FILES;
- public static String MSG_WARNING_NO_SERVICE_ELEMENT;
- public static String STILL_VALIDATING_WSDL;
- public static String CANCEL_VALIDATION_LABEL;
- public static String CANCEL_VALIDATION_DESCRIPTION;
- public static String CANCEL_ALL_VALIDATION_LABEL;
- public static String CANCEL_ALL_VALIDATION_DESCRIPTION;
- public static String WAIT_VALIDATION_LABEL;
- public static String WAIT_VALIDATION_DESCRIPTION;
- public static String TASK_LABEL_CHECK_WSDL_VALIDATION;
- public static String TASK_DESC_CHECK_WSDL_VALIDATION;
- public static String MESSAGE_VALIDATE_NO_WSDL;
- public static String MESSAGE_VALIDATE_REMOTE_WSDL;
- public static String MESSAGE_VALIDATE_ALL_WSDL;
- public static String MESSAGE_VALIDATE_IN_PROGRESS;
- public static String ERROR_MESSAGES_IN_VALIDATION;
- public static String WARNING_MESSAGES_IN_VALIDATION;
- public static String WARNING_IF_CONTINUE;
- public static String VALIDATION_COMPLETED;
- public static String TOOLTIP_VALIDATE_TEXT_MESSAGE_SUMMARY;
- public static String LABEL_BUTTON_STOP_WSDL_VALIDATION;
- public static String TOOLTIP_STOP_VALIDATION_BUTTON;
- public static String PAGE_TITLE_WS_START_SERVER;
- public static String PAGE_DESC_WS_START_SERVER;
- public static String LABEL_START_SERVER_TEXT1;
- public static String LABEL_START_SERVER_TEXT2;
- public static String LABEL_START_SERVER_TEXT3;
- public static String LABEL_START_SERVER_TEXT4;
- public static String LABEL_START_SERVER_BUTTON;
- public static String TOOLTIP_START_SERVER_BUTTON;
- public static String TEXT_SERVER_STATUS;
- public static String TEXT_SERVER_MSG;
- public static String TEXT_SERVER_STARTED;
- public static String TEXT_SERVER_STARTING;
- public static String TEXT_SERVER_STOPPED;
- public static String MSG_INFO_ANT_RUNTIME_HEADING;
- public static String MSG_INFO_ANT_SERVER_RUNTIME;
- public static String MSG_INFO_ANT_CLIENT_RUNTIME;
- public static String MSG_INFO_ANT_SERVER_HEADING;
- public static String MSG_INFO_ANT_SERVER;
- public static String MSG_ERROR_WEB_SERVICE_CLIENTS_NOT_FOUND;
- public static String MSG_ERROR_WEB_SERVICES_NOT_FOUND;
- public static String MSG_ERROR_WSDD_NOT_FOUND;
- public static String MSG_CLIENT_CANNOT_ASSOCIATE;
- public static String MSG_SERVICE_CANNOT_ASSOCIATE;
- public static String MSG_PROJECT_MUST_EXIST;
- public static String MSG_ERROR_INVALID_MULTIPLE_SERVICE_SELECT;
- public static String MSG_ERROR_MODULE_DEPENDENCY;
- public static String MSG_INFO_WSDL_OPERATION_TIMED_OUT;
- public static String MSG_SERVER_NOT_FOUND_WARNING;
- public static String MSG_WARN_CONVERTED_TO_UTIL;
- public static String MSG_LOADING_WEB_SERVICE;
-
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, ConsumptionUIMessages.class);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/ant/AntClientRootCommandFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/ant/AntClientRootCommandFragment.java
deleted file mode 100644
index 14e0d37..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/ant/AntClientRootCommandFragment.java
+++ /dev/null
@@ -1,224 +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
- * -------- -------- -----------------------------------------------------------
- * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060529 141422 kathy@ca.ibm.com - Kathy Chan
- * 20060530 144358 kathy@ca.ibm.com - Kathy Chan
- * 20060530 144350 kathy@ca.ibm.com - Kathy Chan
- * 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)
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.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.CheckForServiceProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.ListOptionsCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.data.EclipseIPath2URLStringTransformer;
-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.widgets.ClientWizardWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.WSDLSelectionOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.WSDLSelectionWidgetDefaultingCommand;
-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.runtime.ClientRuntimeSelectionWidgetDefaultingCommand;
-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.FinishDefaultCommand;
-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.ws.internal.extensions.AssembleClientFragment;
-import org.eclipse.wst.ws.internal.extensions.DeployClientFragment;
-import org.eclipse.wst.ws.internal.extensions.DevelopClientFragment;
-
-/**
- *
- * Command fragment for generating a web service client 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 AntClientRootCommandFragment extends SequenceFragment{
-
- public AntClientRootCommandFragment()
- {
-
- add( new SimpleFragment( new ScenarioCleanupCommand(), "" ));
-
- add( new SimpleFragment(new ListOptionsCommand(), ""));
- add (new SimpleFragment(new AntDefaultingOperation(), ""));
-
- add( new SimpleFragment( new ClientWizardWidgetDefaultingCommand(true), "" ) );
- add( new SimpleFragment( new ClientWizardWidgetOutputCommand(), "" ));
- add( new SimpleFragment( new WSDLSelectionWidgetDefaultingCommand(), ""));
-
- add( new SimpleFragment( new WSDLSelectionOutputCommand(), ""));
- add( new SimpleFragment( new ClientRuntimeSelectionWidgetDefaultingCommand(), ""));
-
- add( new SimpleFragment( new ClientExtensionDefaultingCommand( true ), ""));
- add( new ClientRootFragment() );
- add( new SimpleFragment( new ClientExtensionOutputCommand(), "" ) );
-
- add(new FinishFragment());
- add( new SimpleFragment( new AntRestoringCommand(), "" ));
- add( new SimpleFragment( new ScenarioCleanupCommand(), "" ));
- add( new SimpleFragment( new AntWorkspaceSaveCommand(), ""));
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- // Map ClientWizardWidgetDefaultingCommand command.
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "TestService", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ResourceContext", ClientWizardWidgetOutputCommand.class);
-
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "DevelopClient", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "AssembleClient", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "DeployClient", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "StartClient", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ResourceContext", ClientRuntimeSelectionWidgetDefaultingCommand.class);
-
-
- // Map ClientWizardWidgetOutputCommand command.
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "ClientTypeRuntimeServer", ClientRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "TestService", WSDLSelectionOutputCommand.class);
- dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "TestService", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "TestService", ClientRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "ResourceContext", ClientRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "ResourceContext", ClientExtensionDefaultingCommand.class);
-
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "InstallClient", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "StartClient", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "DevelopClient", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "AssembleClient", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "DeployClient", ClientExtensionDefaultingCommand.class);
-
-
- // Map ClientRuntimeSelectionWidgetDefaultingCommand command
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientRuntimeId", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "Runtime2ClientTypes", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentType", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientJ2EEVersion", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientNeedEAR", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "Runtime2ClientTypes", CheckForServiceProjectCommand.class);
-
-// Map AntDefaultingOperation
- dataRegistry.addMapping(AntDefaultingOperation.class, "ClientIdsFixed", ClientRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(AntDefaultingOperation.class, "StartService", PreClientDevelopCommand.class);
- dataRegistry.addMapping(AntDefaultingOperation.class, "InstallClient", PreClientDevelopCommand.class);
- dataRegistry.addMapping(AntDefaultingOperation.class, "DeployClient", PreClientDevelopCommand.class);
-
- // Map WSDLSelectionWidgetDefaultingCommand command.
- dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "GenWSIL", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "WsilURI", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "WebServiceURI", WSDLSelectionOutputCommand.class, "WsdlURI", new EclipseIPath2URLStringTransformer());
- dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "Project", WSDLSelectionOutputCommand.class);
- dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "ComponentName", WSDLSelectionOutputCommand.class);
-
- // WSDLSelectionOutputCommand
- dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WsdlURI", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WebServicesParser", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "Project", ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialProject", null);
- dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WsdlURI", ClientRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "ComponentName", ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialComponentName", null);
- dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WebServicesParser", ClientRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WsdlURI", CheckForServiceProjectCommand.class);
- dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WebServicesParser", CheckForServiceProjectCommand.class);
-
- // Setup the PreClientDevelopCommand.
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientRuntimeId", PreClientDevelopCommand.class );
- dataRegistry.addMapping( ClientWizardWidgetOutputCommand.class, "TestService", PreClientDevelopCommand.class);
- dataRegistry.addMapping( ClientWizardWidgetOutputCommand.class, "ResourceContext", PreClientDevelopCommand.class);
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", 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( ClientWizardWidgetOutputCommand.class, "ResourceContext", PreClientDevelopCommand.class);
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "WsdlURI", 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, "StartClient", PreClientDevelopCommand.class, "StartService", null);
-
- dataRegistry.addMapping( PreClientDevelopCommand.class, "WebService", ClientExtensionOutputCommand.class, "WebServiceClient", null );
-
- // Map ClientExtensionDefaultingCommand command.
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionFragment.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "GenerateProxy", ClientTestFragment.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",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "WsdlURI", ClientTestDelegateCommand.class);
-
- // Map ClientExtensionOutputCommand command.
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ServerInstanceId", FinishDefaultCommand.class);
-
- // MAP post server config call
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", ClientExtensionOutputCommand.class, "EarProjectName", null);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServerInstance", ClientExtensionOutputCommand.class, "ExistingServerId", null);
-
- //Mappings to enable peek-ahead for Page 3 of the client wizard
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "WebService", DevelopClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Environment", DevelopClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Context", DevelopClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Selection", DevelopClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", DevelopClientFragment.class, "Project", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", DevelopClientFragment.class, "Module", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", DevelopClientFragment.class, "EarProject", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", DevelopClientFragment.class, "Ear", null );
-
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "WebService", AssembleClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Environment", AssembleClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Context", AssembleClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Selection", AssembleClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", AssembleClientFragment.class, "Project", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", AssembleClientFragment.class, "Module", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", AssembleClientFragment.class, "EarProject", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", AssembleClientFragment.class, "Ear", null );
-
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "WebService", DeployClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Environment", DeployClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Context", DeployClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Selection", DeployClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", DeployClientFragment.class, "Project", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", DeployClientFragment.class, "Module", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", DeployClientFragment.class, "EarProject", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", DeployClientFragment.class, "Ear", null );
-
- dataRegistry.addMapping(AntDefaultingOperation.class, "RendererValidation", AntRestoringCommand.class);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/AntDefaultingOperation.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/AntDefaultingOperation.java
deleted file mode 100644
index 3fbf57b..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/AntDefaultingOperation.java
+++ /dev/null
@@ -1,79 +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
- * -------- -------- -----------------------------------------------------------
- * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20061011 159283 makandre@ca.ibm.com - Andrew Mak, project not associated to EAR when using ant on command-line
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.command;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-
-public class AntDefaultingOperation extends AbstractDataModelOperation{
-
- private boolean rendererValidation;
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- // TODO Auto-generated method stub
-
- rendererValidation = RendererFactory.getDefaultRendererFactory().isValidating();
- RendererFactory.getDefaultRendererFactory().setValidating(false);
-
- return Status.OK_STATUS;
- }
-
- public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-
- RendererFactory.getDefaultRendererFactory().setValidating(rendererValidation);
-
- return Status.OK_STATUS;
- }
-
- public boolean getServiceIdsFixed()
- {
- return true;
- }
-
- public boolean getClientIdsFixed()
- {
- return true;
- }
-
- public boolean getStartService()
- {
- return false;
- }
-
- public boolean getInstallService()
- {
- return false;
- }
-
- public boolean getDeployService()
- {
- return true;
- }
-
- public boolean getDeployClient()
- {
- return true;
- }
-
- public boolean getRendererValidation()
- {
- return rendererValidation;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/AntRestoringCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/AntRestoringCommand.java
deleted file mode 100644
index 5c73902..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/AntRestoringCommand.java
+++ /dev/null
@@ -1,39 +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
- * -------- -------- -----------------------------------------------------------
- * 20061011 159283 makandre@ca.ibm.com - Andrew Mak, project not associated to EAR when using ant on command-line
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.command;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-
-public class AntRestoringCommand extends AbstractDataModelOperation{
-
- private boolean rendererValidation;
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-
- RendererFactory.getDefaultRendererFactory().setValidating(rendererValidation);
-
- return Status.OK_STATUS;
- }
-
- public void setRendererValidation(boolean rendererValidation)
- {
- this.rendererValidation = rendererValidation;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/AntWorkspaceSaveCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/AntWorkspaceSaveCommand.java
deleted file mode 100644
index be00099..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/AntWorkspaceSaveCommand.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070501 178129 makandre@ca.ibm.com - Andrew Mak, workspace reports "crash detected" after running WS ant task (cmdline)
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.command;
-
-import org.eclipse.core.commands.ExecutionException;
-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.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class AntWorkspaceSaveCommand extends AbstractDataModelOperation {
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- try {
- // attempt to save the state of the workspace
- ResourcesPlugin.getWorkspace().save(true, monitor);
- return Status.OK_STATUS;
- }
- catch (CoreException e) {
- throw new ExecutionException(e.getMessage(), e);
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/CheckForServiceProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/CheckForServiceProjectCommand.java
deleted file mode 100644
index b356743..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/CheckForServiceProjectCommand.java
+++ /dev/null
@@ -1,94 +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.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.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ValidationUtils;
-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.StatusException;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-/**
- * This command checks to see if the selected client project is the
- * service project. If so, the user is warned.
- */
-public class CheckForServiceProjectCommand extends AbstractDataModelOperation
-{
- //SelectionListChoices runtime2ClientTypes;
- String clientProjectName;
- String wsdlURI;
- WebServicesParser webServicesParser;
-
- public CheckForServiceProjectCommand()
- {
- }
-
-
- public void setClientProjectName(String name)
- {
- clientProjectName = name;
- }
-
- public void setWsdlURI(String wsdlURI)
- {
- this.wsdlURI = wsdlURI;
- }
-
- public void setWebServicesParser(WebServicesParser webServicesParser)
- {
- this.webServicesParser = webServicesParser;
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.core.Command#execute(org.eclipse.wst.command.internal.env.core.common.Environment)
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
- IStatus status = Status.OK_STATUS;
- if (clientProjectName==null || wsdlURI==null || wsdlURI.length()==0 || webServicesParser==null)
- return status;
-
- if (clientProjectName==null || clientProjectName.length()==0)
- return status;
-
- IProject clientProject = ProjectUtilities.getProject(clientProjectName);
- ValidationUtils vu = new ValidationUtils();
- boolean isServiceProject = vu.isProjectServiceProject(clientProject, wsdlURI, webServicesParser);
- if (isServiceProject)
- {
- IStatus wStatus = StatusUtils.warningStatus( NLS.bind(ConsumptionUIMessages.MSG_WARN_IS_SERVICE_PROJECT, new String[]{clientProjectName}) );
- try
- {
- environment.getStatusHandler().report(wStatus);
- }
- catch (StatusException se)
- {
- //User decided to abort. Return an error status
- IStatus eStatus = StatusUtils.errorStatus( ConsumptionUIMessages.MSG_USER_ABORTED );
- return eStatus;
- }
- }
-
- return status;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/GenerateHandlerSkeletonCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/GenerateHandlerSkeletonCommand.java
deleted file mode 100644
index 9878261..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/GenerateHandlerSkeletonCommand.java
+++ /dev/null
@@ -1,304 +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
- * -------- -------- -----------------------------------------------------------
- * 20060404 134913 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060517 142027 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.command;
-
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.List;
-
-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.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.common.HandlerDescriptionHolder;
-import org.eclipse.jst.ws.internal.consumption.ui.common.HandlerServiceRefHolder;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-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.ui.eclipse.EnvironmentUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-
-public class GenerateHandlerSkeletonCommand extends AbstractDataModelOperation
-{
- private IPath outputLocation_;
- private boolean genSkeleton_;
- private String handlerNameForEdit_ = null;
-
- private HandlerServiceRefHolder[] handlerServiceRefHolder_;
- private HandlerDescriptionHolder[]handlerDescriptionHolder_;
-
- public GenerateHandlerSkeletonCommand()
- {
- }
-
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
-
- IStatus returnStatus = Status.OK_STATUS;
-
- if (!genSkeleton_) return returnStatus;
-
- // form the map of classname to locations
- if (handlerDescriptionHolder_!=null){
- for (int i=0;i<handlerDescriptionHolder_.length;i++){
- Hashtable handlerTable = new Hashtable();
- IPath outPath = handlerDescriptionHolder_[i].getSourceOutputPath();
- List handlers = handlerDescriptionHolder_[i].getHandlerList();
- for (int j=0;j<handlers.size();j++){
- HandlerTableItem hti = (HandlerTableItem)handlers.get(j);
- String className = hti.getHandlerClassName();
- if (className!=null && outPath!=null)
- handlerTable.put(className, outPath);
- }
- returnStatus = genHandlersClasses(handlerTable, monitor);
- }
-
- }
- else {
- for (int i=0;i<handlerServiceRefHolder_.length;i++){
- Hashtable handlerTable = new Hashtable();
- IPath outPath = handlerServiceRefHolder_[i].getSourceOutputPath();
- List handlers = handlerServiceRefHolder_[i].getHandlerList();
- for (int j=0;j<handlers.size();j++){
- HandlerTableItem hti = (HandlerTableItem)handlers.get(j);
- String className = hti.getHandlerClassName();
- if (className!=null && outPath!=null)
- handlerTable.put(className, outPath);
- }
- returnStatus = genHandlersClasses(handlerTable, monitor);
- }
- }
-
-
- return returnStatus;
-
- }
-
- private IStatus genHandlersClasses(Hashtable handlersForGen, IProgressMonitor monitor){
- IEnvironment env = getEnvironment();
- MultiStatus status = null;
- IStatus returnStatus = Status.OK_STATUS;
- boolean error = false;
-
- IStatus writeStatus;
- Enumeration keys = handlersForGen.keys();
- while (keys.hasMoreElements()) {
- String className = (String)keys.nextElement();
- writeStatus = writeFile(env, className, (IPath)handlersForGen.get(className), monitor );
- // handle status return
- if (writeStatus.getSeverity() == Status.ERROR) { // write status is OK or ERROR
- error = true;
- if (status == null) {
- status = StatusUtils.multiStatus( ConsumptionUIMessages.MSG_ERROR_GENERATE_HANDLER_SKELETON, new IStatus[0] );
- }
- status.add(writeStatus);
- }
- }
-
- if (error)
- {
- env.getStatusHandler().reportError(status);
- returnStatus = status;
- }
-
- return returnStatus;
-
- }
-
-
- private IStatus writeFile (IEnvironment env, String className, IPath outputLocation, IProgressMonitor monitor )
- {
- IStatus status = Status.OK_STATUS;
- int index;
-
- String simpleClassName = className;
- String packageName = null;
- IPath filePath = outputLocation;
- if (className != null) {
- index = className.lastIndexOf('.');
- if (index != -1) {
- simpleClassName = className.substring(index + 1);
- packageName = className.substring(0, index);
-
- String packageSegment = packageName;
- int j = 0;
- j = packageSegment.indexOf('.');
- while (j != -1) {
- filePath = filePath.append(packageSegment.substring(0, j));
- packageSegment = packageSegment.substring(j + 1);
- j = packageSegment.indexOf('.');
- }
- filePath = filePath.append(packageSegment);
- }
- else {
- packageName = "";
- }
- }
-
- filePath = filePath.append(simpleClassName);
-
- filePath = filePath.addFileExtension("java");
-
- // check if Handler already exists; do not overwrite existing Handlers
- IResource workspaceRes = ResourceUtils.findResource(filePath);
- if (workspaceRes!=null && workspaceRes.exists()) {
- return status;
- }
-
- if (handlerNameForEdit_ == null){
- handlerNameForEdit_ = className;
- outputLocation_ = outputLocation;
- }
-
- OutputStream outputStream = FileResourceUtils.newFileOutputStream( EnvironmentUtils.getResourceContext(env), filePath, monitor, env.getStatusHandler());
- // create buffered writer for writing file
- BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(outputStream));
- try {
- if (packageName.length() != 0) {
- bw.write("package " +packageName+";");
- bw.newLine();
- bw.newLine();
- }
- bw.write("import javax.xml.rpc.handler.GenericHandler;");
- bw.newLine();
- bw.write("import javax.xml.rpc.handler.MessageContext;");
- bw.newLine();
- bw.write("import javax.xml.namespace.QName;");
- bw.newLine();
- bw.newLine();
-
- bw.write("public class "+simpleClassName+" extends GenericHandler");
- bw.newLine();
- bw.write("{");
- bw.newLine();
- bw.newLine();
-
- bw.write(" public QName[] getHeaders ()");
- bw.newLine();
- bw.write(" {");
- bw.newLine();
- bw.write(" // Fill in method body");
- bw.newLine();
- bw.write(" return null;");
- bw.newLine();
- bw.write(" }");
- bw.newLine();
- bw.newLine();
- bw.write(" public boolean handleRequest( MessageContext context )");
- bw.newLine();
- bw.write(" {");
- bw.newLine();
- bw.write(" // Fill in method body or delete method to use GenericHandler");
- bw.newLine();
- bw.write(" return true;");
- bw.newLine();
- bw.write(" }");
- bw.newLine();
- bw.newLine();
- bw.write(" public boolean handleResponse( MessageContext context )");
- bw.newLine();
- bw.write(" {");
- bw.newLine();
- bw.write(" // Fill in method body or delete method to use GenericHandler ");
- bw.newLine();
- bw.write(" return true;");
- bw.newLine();
- bw.write(" }");
- bw.newLine();
- bw.newLine();
- bw.write(" public boolean handleFault( MessageContext context )");
- bw.newLine();
- bw.write(" {");
- bw.newLine();
- bw.write(" // Fill in method body or delete method to use GenericHandler");
- bw.newLine();
- bw.write(" return true;");
- bw.newLine();
- bw.write(" }");
- bw.newLine();
-
- bw.newLine();
- bw.write("}");
- bw.close();
- status = Status.OK_STATUS;
- }
- catch (IOException e)
- {
- status = StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_ERROR_WRITE_FILE, new String[]{ className }), e );
- if (bw != null) {
- try {
- bw.close();
- } catch (IOException e1) {
- }
- }
- }
- return status;
- }
-
- public void setGenSkeletonEnabled(boolean genSkeleton)
- {
- this.genSkeleton_ = genSkeleton;
- }
-
- public IProject getProject(){
- IProject project = null;
- if (outputLocation_!=null){
- project = ResourceUtils.getProjectOf(outputLocation_);
- }
- return project;
- }
-
- public List getClassNames(){
- List classes = new ArrayList();
- if (handlerNameForEdit_!=null){
- classes.add(handlerNameForEdit_);
- }
- return classes;
- }
-
- /**
- * An array of HandlerDescriptionHolders
- * @return
- */
- public void setHandlerServiceRefHolder(HandlerServiceRefHolder[] handlerHolders){
- this.handlerServiceRefHolder_ = handlerHolders;
- }
-
- /**
- * An array of HandlerDescriptionHolders
- * @return
- */
- public void setHandlerDescriptionHolders(HandlerDescriptionHolder[] handlerHolders){
- this.handlerDescriptionHolder_ = handlerHolders;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/ListOptionsCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/ListOptionsCommand.java
deleted file mode 100644
index d51a7c2..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/ListOptionsCommand.java
+++ /dev/null
@@ -1,122 +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.consumption.ui.command;
-
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.ServerCore;
-
-/**
- * Command lists valid property values where requested.
- * Requests made via a Ant property value setting which is mapped to this command in the plugin.xml
- */
-
-public class ListOptionsCommand extends AbstractDataModelOperation {
-
- private boolean runtimes_ = false;
- private boolean servers_ = false;
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info)
- throws ExecutionException {
-
- if (runtimes_)
- {
- String[] typeIds = WebServiceRuntimeExtensionUtils2.getServiceTypeLabels().getIds_();
- Vector runtimeIds = new Vector();
- for (int k = 0; k < typeIds.length; k++) {
-
- String typeId = typeIds[k];
- String[] runtimes = WebServiceRuntimeExtensionUtils2.getRuntimesByServiceType(typeId);
-
- for (int j = 0; j < runtimes.length; j++) {
- String runtime = runtimes[j];
- if (!runtimeIds.contains(runtime))
- {
- runtimeIds.add(runtime);
- }
- }
- }
-
- Status statusObj = new Status(IStatus.INFO,
- WebServiceConsumptionUIPlugin.ID,
- IStatus.OK,
- ConsumptionUIMessages.MSG_INFO_ANT_RUNTIME_HEADING,
- null);
- getEnvironment().getStatusHandler().reportInfo(statusObj);
-
-
- for (Iterator iterator = runtimeIds.iterator(); iterator
- .hasNext();) {
- getEnvironment().getStatusHandler().reportInfo(new Status(IStatus.INFO,
- WebServiceConsumptionUIPlugin.ID,
- IStatus.OK,
- NLS.bind(ConsumptionUIMessages.MSG_INFO_ANT_SERVER_RUNTIME,
- iterator.next()), null));
- }
-
-
- String[] clientRuntimes = WebServiceRuntimeExtensionUtils2.getAllRuntimesForClientSide();
-
- for (int i = 0; i < clientRuntimes.length; i++) {
-
- getEnvironment().getStatusHandler().reportInfo(new Status(IStatus.INFO,
- WebServiceConsumptionUIPlugin.ID,
- IStatus.OK,
- NLS.bind(ConsumptionUIMessages.MSG_INFO_ANT_CLIENT_RUNTIME,
- clientRuntimes[i]), null));
- }
- }
-
- if (servers_)
- {
- getEnvironment().getStatusHandler().reportInfo(new Status(IStatus.INFO,
- WebServiceConsumptionUIPlugin.ID,
- IStatus.OK,
- ConsumptionUIMessages.MSG_INFO_ANT_SERVER_HEADING, null));
-
- IServerType[] serverTypes = ServerCore.getServerTypes();
- for (int i=0; i<serverTypes.length; i++)
- {
- getEnvironment().getStatusHandler().reportInfo(new Status(IStatus.INFO,
- WebServiceConsumptionUIPlugin.ID,
- IStatus.OK,
- NLS.bind(ConsumptionUIMessages.MSG_INFO_ANT_SERVER,
- serverTypes[i].getId()), null));
-
- }
- }
-
- return OK_STATUS;
- }
-
- public void setListRuntimes(boolean value)
- {
- runtimes_=value;
- }
-
- public void setListServers(boolean value)
- {
- servers_=value;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/OpenJavaEditorCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/OpenJavaEditorCommand.java
deleted file mode 100644
index 53bedd5..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/OpenJavaEditorCommand.java
+++ /dev/null
@@ -1,110 +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
- * -------- -------- -----------------------------------------------------------
- * 20060404 134913 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.command;
-
-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.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ui.progress.UIJob;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class OpenJavaEditorCommand extends AbstractDataModelOperation
-{
- private List classNames;
- private IProject project;
- private boolean isEnabled_ = true; // is true by default
-
- public OpenJavaEditorCommand()
- {
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- if (isEnabled_) {
- OpenJavaEditorJob job = new OpenJavaEditorJob(classNames, project);
- job.setPriority(Job.LONG);
- job.schedule();
- }
- return Status.OK_STATUS;
- }
-
- public void setClassNames(List classNames)
- {
- this.classNames = classNames;
- }
-
- public void setProject(IProject project)
- {
- this.project = project;
- }
-
- public void setIsEnabled(boolean isEnabled){
- this.isEnabled_ = isEnabled;
- }
-
- private class OpenJavaEditorJob extends UIJob
- {
- private List classNames;
- private IProject project;
-
- public OpenJavaEditorJob(List classNames, IProject project)
- {
- super("org.eclipse.jst.ws.internal.consumption.ui.command.OpenJavaEditorJob");
- this.classNames = classNames;
- this.project = project;
- }
-
- public IStatus runInUIThread(IProgressMonitor monitor)
- {
- if (project != null && classNames != null)
- {
- IJavaProject javaProject = JavaCore.create(project);
- for (Iterator it = classNames.iterator(); it.hasNext();)
- {
- String className = (String)it.next();
- try
- {
- IType type = javaProject.findType(className);
- JavaUI.openInEditor(type);
- }
- catch (Throwable t)
- {
- return new org.eclipse.core.runtime.Status(org.eclipse.core.runtime.Status.ERROR, WebServiceConsumptionUIPlugin.ID, 0, NLS.bind(ConsumptionUIMessages.MSG_ERROR_UNABLE_TO_OPEN_JAVA_EDITOR, new String[]{className, project.getName()}), t);
- }
- }
- return Status.OK_STATUS;
- }
- else if (project!=null || classNames.isEmpty()){
- // do nothing ; nothing to open
- return Status.OK_STATUS;
- }
- else
- return new org.eclipse.core.runtime.Status(org.eclipse.core.runtime.Status.ERROR, WebServiceConsumptionUIPlugin.ID, 0, NLS.bind(ConsumptionUIMessages.MSG_ERROR_UNABLE_TO_OPEN_JAVA_EDITOR, new String[]{classNames != null ? classNames.toString() : "", project != null ? project.getName() : ""}), null);
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/StartServerCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/StartServerCommand.java
deleted file mode 100644
index e1545ff..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/StartServerCommand.java
+++ /dev/null
@@ -1,213 +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
- * -------- -------- -----------------------------------------------------------
- * 20070426 162287 makandre@ca.ibm.com - Andrew Mak, Server publish cancel button unavailable
- * 20080509 165327 kathy@ca.ibm.com - Kathy Chan, Use API from IServer to call shouldPublish and shouldRestart
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.command;
-
-import java.lang.reflect.InvocationTargetException;
-
-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.debug.core.ILaunchManager;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.command.common.ServerPublishOperationListener;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.EnvironmentService;
-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.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-
-/**
- * (Re)Starts and publishes the server specifed by the serverInstanceId attribute.
- *
- *
- */
-public class StartServerCommand extends AbstractDataModelOperation
-{
- private ILog log;
- private boolean doAsyncPublish_;
-
- private String serverInstanceId;
-
-
- public StartServerCommand()
- {
- log = EnvironmentService.getEclipseLog();
- doAsyncPublish_ = true;
- }
-
- public StartServerCommand( boolean doAsyncPublish )
- {
- this();
-
- doAsyncPublish_ = doAsyncPublish;
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
- IStatus status = Status.OK_STATUS;
-
- IServer server = ServerCore.findServer(serverInstanceId);
- if (server == null)
- {
- status = StatusUtils.errorStatus(ConsumptionMessages.MSG_ERROR_INSTANCE_NOT_FOUND);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- int serverState = server.getServerState();
-
- // Publish if required
- if (server.shouldPublish()) {
- if (server.canPublish().getSeverity() == IStatus.OK)
- {
- status = publish(server, IServer.PUBLISH_INCREMENTAL, monitor );
- if (status.getSeverity() == Status.ERROR)
- {
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
- }
-
- // start/restart server if required
-
- switch (serverState)
- {
- case IServer.STATE_STOPPED:
- if (server.canStart(ILaunchManager.RUN_MODE).getSeverity()==IStatus.OK)
- {
- status = start(server, monitor );
- if (status.getSeverity() == Status.ERROR)
- {
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
- break;
- case IServer.STATE_STARTED:
- boolean shouldRestart = server.shouldRestart();
-
- if (shouldRestart && server.canRestart(ILaunchManager.RUN_MODE).getSeverity()==IStatus.OK)
- {
- status = restart(server, monitor );
- if (status.getSeverity() == Status.ERROR)
- {
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
- }
-
- return status;
- }
-
- private IStatus publish(final IServer server, final int kind, IProgressMonitor monitor )
- {
- IStatus status = Status.OK_STATUS;
- final IStatus[] istatus = new IStatus[1];
- monitor.subTask(ConsumptionMessages.PROGRESS_INFO_PUBLISHING_SERVER);
- IRunnableWithProgress runnable = new IRunnableWithProgress()
- {
- public void run(IProgressMonitor shellMonitor) throws InvocationTargetException, InterruptedException
- {
- ServerPublishOperationListener publishListener = new ServerPublishOperationListener();
- server.publish(IServer.PUBLISH_INCREMENTAL, null, null, publishListener);
- istatus[0] = publishListener.getPublishStatus();
- }
- };
-
- try
- {
- if( doAsyncPublish_ )
- {
- ProgressMonitorDialog dialog = new ProgressMonitorDialog(null);
- dialog.run(true, true, runnable);
- }
- else
- {
- runnable.run( monitor );
- }
-
- }
- catch(InvocationTargetException ite)
- {
- istatus[0] = new org.eclipse.core.runtime.Status( IStatus.ERROR, "id", 0, ite.getMessage(), ite );
- ite.printStackTrace();
- }
- catch(InterruptedException ie)
- {
- istatus[0] = new org.eclipse.core.runtime.Status( IStatus.ERROR, "id", 0, ie.getMessage(), ie );
- ie.printStackTrace();
- }
-
-
- if (istatus[0].getSeverity() != IStatus.OK)
- {
- status = istatus[0];
- if (status.getSeverity() == IStatus.CANCEL)
- status = StatusUtils.errorStatus("");
- return status;
- }
-
- log.log(ILog.INFO, 5051, this, "publishProject", "IServer=" + server + ", Publish command completed");
- return status;
- }
-
- private IStatus restart(IServer server, IProgressMonitor monitor )
- {
- IStatus status = Status.OK_STATUS;
- try
- {
- monitor.subTask(ConsumptionMessages.PROGRESS_INFO_STARTING_SERVER);
- server.synchronousRestart(ILaunchManager.RUN_MODE, monitor);
- log.log(ILog.INFO, 5052, this, "execute", "IServer=" + server + ", Restart command completed");
- return status;
- } catch (CoreException e)
- {
- status = StatusUtils.errorStatus(ConsumptionMessages.MSG_ERROR_SERVER, e);
- return status;
- }
-
- }
-
- private IStatus start(IServer server, IProgressMonitor monitor )
- {
- IStatus status = Status.OK_STATUS;
- try
- {
- monitor.subTask(ConsumptionMessages.PROGRESS_INFO_STARTING_SERVER);
- server.synchronousStart(ILaunchManager.RUN_MODE, monitor);
- log.log(ILog.INFO, 5053, this, "execute", "IServer=" + server + ", Start command completed");
- return status;
- } catch (CoreException e)
- {
- status = StatusUtils.errorStatus(ConsumptionMessages.MSG_ERROR_SERVER, e);
- return status;
- }
- }
-
- public void setServerInstanceId(String serverInstanceId)
- {
- this.serverInstanceId = serverInstanceId;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/WSINonCompliantRuntimeCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/WSINonCompliantRuntimeCommand.java
deleted file mode 100644
index 507cdad..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/WSINonCompliantRuntimeCommand.java
+++ /dev/null
@@ -1,87 +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
- * -------- -------- -----------------------------------------------------------
- * 20060420 120714 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.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.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.WstWSPluginMessages;
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-import org.eclipse.wst.ws.internal.preferences.PersistentWSIAPContext;
-import org.eclipse.wst.ws.internal.preferences.PersistentWSISSBPContext;
-import org.eclipse.wst.ws.internal.preferences.WSIComplianceUtils;
-
-
-
-public class WSINonCompliantRuntimeCommand extends AbstractDataModelOperation
-{
-
- private IProject serviceProject_;
-
- public WSINonCompliantRuntimeCommand()
- {
- }
-
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
-
- PersistentWSISSBPContext wsiSSBPContext = WSPlugin.getInstance().getWSISSBPContext();
- PersistentWSIAPContext wsiAPContext = WSPlugin.getInstance().getWSIAPContext();
- Vector statusSSBP = new Vector();
- statusSSBP.add( new Status( WSIComplianceUtils.getWSISeverity(serviceProject_, wsiSSBPContext), "id", 0,
- WstWSPluginMessages.WSI_SSBP_INCOMPLIANT_RUNTIME, null ) );
- Status[] statusesSSBP = (Status[]) statusSSBP.toArray(new Status[statusSSBP.size()]);
-
- Vector statusAP = new Vector();
- statusAP.add( new Status( WSIComplianceUtils.getWSISeverity(serviceProject_, wsiAPContext), "id", 0,
- WstWSPluginMessages.WSI_AP_INCOMPLIANT_RUNTIME, null ));
- Status[] statusesAP = (Status[]) statusAP.toArray(new Status[statusAP.size()]);
-
- if (WSIComplianceUtils.checkWSICompliance (environment.getStatusHandler(), statusesAP, serviceProject_, wsiAPContext))
- {
- if (WSIComplianceUtils.checkWSICompliance (environment.getStatusHandler(), statusesSSBP, serviceProject_, wsiSSBPContext))
- {
- return Status.OK_STATUS;
- }
- else
- {
- // Set message to empty string so that an error dialog does
- // not pop-up telling the user that they cannot continue
- // because they choose not to ignore the WS-I non-compliance warning.
- return StatusUtils.errorStatus( "" );
- }
- }
- else
- {
- // Set message to empty string so that an error dialog does
- // not pop-up telling the user that they cannot continue
- // because they choose not to ignore the WS-I non-compliance warning.
- return StatusUtils.errorStatus( "" );
- }
- }
-
- public void setServiceProject(IProject serviceProject) {
- this.serviceProject_ = serviceProject;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/EclipseIPath2URLStringTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/EclipseIPath2URLStringTransformer.java
deleted file mode 100644
index ca35e38..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/EclipseIPath2URLStringTransformer.java
+++ /dev/null
@@ -1,40 +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.consumption.ui.command.data;
-
-import java.net.MalformedURLException;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-
-
-public class EclipseIPath2URLStringTransformer implements Transformer
-{
- public Object transform(Object value)
- {
- String s = value.toString();
- if (s.indexOf(":") < 0)
- {
- IResource res = ResourcesPlugin.getWorkspace().getRoot().findMember(value.toString());
- if (res.exists())
- {
- try
- {
- s = res.getLocation().toFile().toURL().toString();
- }
- catch (MalformedURLException murle)
- {
- }
- }
- }
- return s;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ProjectName2IProjectTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ProjectName2IProjectTransformer.java
deleted file mode 100644
index ac65f41..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ProjectName2IProjectTransformer.java
+++ /dev/null
@@ -1,40 +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 124302 rsinha@ca.ibm.com - Rupam Kuehner
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.command.data;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-
-public class ProjectName2IProjectTransformer implements Transformer
-{
- public Object transform(Object value)
- {
- if (value != null)
- {
- String project = (String) value;
- int slashIndex = project.indexOf('/');
- String projectName = project;
-
- if (slashIndex != -1)
- {
- projectName = project.substring(0, slashIndex);
- }
-
- return ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- } else
- {
- return null;
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerInstToIServerTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerInstToIServerTransformer.java
deleted file mode 100644
index 6f881ca..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerInstToIServerTransformer.java
+++ /dev/null
@@ -1,38 +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 20, 2004
- */
-package org.eclipse.jst.ws.internal.consumption.ui.command.data;
-
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-
-/*
- * Transforms a server instance id to an IServer
- */
-public class ServerInstToIServerTransformer implements Transformer {
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.env.core.data.Transformer#transform(java.lang.Object)
- */
- public Object transform(Object value) {
-
- String existingServerInstId = (String)value;
- IServer serverInst = null;
- if (existingServerInstId != null) {
- serverInst = ServerCore.findServer(existingServerInstId);
- }
- return serverInst;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerName2IServerTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerName2IServerTransformer.java
deleted file mode 100644
index 815d797..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerName2IServerTransformer.java
+++ /dev/null
@@ -1,36 +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.consumption.ui.command.data;
-
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-
-public class ServerName2IServerTransformer implements Transformer
-{
- public Object transform(Object value)
- {
- {
- String serverName = value.toString();
- 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(serverName))
- return server;
- }
- }
- }
- return null;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/DefaultingUtils.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/DefaultingUtils.java
deleted file mode 100644
index a28667f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/DefaultingUtils.java
+++ /dev/null
@@ -1,104 +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
- * -------- -------- -----------------------------------------------------------
- * 20060427 138058 joan@ca.ibm.com - Joan Haggarty
- * 20070723 194434 kathy@ca.ibm.com - Kathy Chan, Check for non-existing EAR with content not deleted
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class DefaultingUtils {
-
- public DefaultingUtils()
- {
-
- }
-
- /**
- *
- * Uses the following steps to determine a valid default EAR project name:
- *
- * 1. If project does exist:
- * a - look for an existing, referencing EAR component, if one exists return that EAR name
- * b - look for an existing EAR component with the same J2EE version as the project
- * 2. If can't find an appropriate existing EAR component or project does not exist in the
- * workspace, return a new EAR name of form projectNameEAR
- * 3. If project name is null or an empty string return the default EAR name
- *
- * @param projectName a string representing the name of the project for the service
- * @return a string to be used as the default EAR project name for the project name provided
- */
- public static String getDefaultEARProjectName(String projectName)
- {
-
- if (projectName != null && projectName.length() > 0) {
-
- IProject proj = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
-
- if (proj.exists()) {
-
- //Step 1a - return a referencing EAR project
- IVirtualComponent[] ears = J2EEUtils.getReferencingEARComponents(proj);
- if (ears != null && ears.length > 0) {
- return ears[0].getName();
- }
-
- //Step 1b - return an appropriate existing EAR project
- IVirtualComponent[] allEarComps = J2EEUtils.getAllEARComponents();
-
- if (allEarComps.length > 0)
- {
- for (int i=0; i < allEarComps.length; i++)
- {
- IProject earProject = allEarComps[i].getProject();
- boolean canAssociate = J2EEUtils.canAssociateProjectToEARWithoutWarning(proj, earProject);
- if (canAssociate)
- {
- return allEarComps[i].getName();
- }
- }
- }
- }
-
-
- String baseEARName = projectName + ResourceUtils.getDefaultEARExtension();
- String earName = baseEARName;
-
- boolean foundEAR = false;
- int i = 1;
-
- while (!foundEAR) {
- // 194434 - Check for non-existing EAR with contents that's not deleted previously
- IStatus canCreateEARStatus = J2EEUtils.canCreateEAR(ProjectUtilities.getProject(earName));
- if (canCreateEARStatus.isOK()) {
- foundEAR = true;
- } else {
- earName = baseEARName + i;
- i++;
- }
- }
-
-
- //Step 2 - return project name with EAR on the end
- return earName;
- }
-
- //Step 3 - return the default EAR project name
- return ResourceUtils.getDefaultServiceEARProjectName();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/FacetOperationDelegate.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/FacetOperationDelegate.java
deleted file mode 100644
index 5abbc8c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/FacetOperationDelegate.java
+++ /dev/null
@@ -1,346 +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
- * -------- -------- -----------------------------------------------------------
- * 20090303 242635 mahutch@ca.ibm.com - Mark Hutchinson, Remove unnecessary UI dependencies from org.eclipse.jst.ws.consumption
- * 20090819 286874 zina@ca.ibm.com - Zina Mostafia
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.common;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.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.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.common.FacetUtils;
-import org.eclipse.jst.ws.internal.consumption.common.IFacetOperationDelegate;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-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;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-import org.osgi.framework.Bundle;
-
-public class FacetOperationDelegate implements IFacetOperationDelegate {
-
- public IStatus addFacetsToProject(final IFacetedProject fproject, final Set projectFacetVersions) {
- final IStatus[] status = new IStatus[1];
- status[0] = Status.OK_STATUS;
- final Set actions = FacetUtils.getInstallActions(projectFacetVersions);
-
- // Create a runnable that applies the install actions to the faceted project
- IRunnableWithProgress runnable = new IRunnableWithProgress() {
- public void run(IProgressMonitor shellMonitor) throws InvocationTargetException, InterruptedException {
- try {
- fproject.modify(actions, shellMonitor);
- fixEJBClassPath(fproject);
- } catch (CoreException e) {
- status[0] = getErrorStatusForAddingFacets(fproject.getProject().getName(), projectFacetVersions, e);
- }
- }
- };
-
- // Run the runnable in another thread unless there is no UI thread (Ant scenarios)
- if (displayPresent()) {
- try {
- PlatformUI.getWorkbench().getProgressService().run(true, false, runnable);
- } catch (InvocationTargetException ite) {
- status[0] = getErrorStatusForAddingFacets(fproject.getProject().getName(), projectFacetVersions, ite);
- } catch (InterruptedException ie) {
- status[0] = getErrorStatusForAddingFacets(fproject.getProject().getName(), projectFacetVersions, ie);
- }
- } else {
- try {
- fproject.modify(actions, null);
- fixEJBClassPath(fproject);
- } catch (CoreException e) {
- status[0] = getErrorStatusForAddingFacets(fproject.getProject().getName(), projectFacetVersions, e);
- }
- }
-
- return status[0];
- }
-
- private void fixEJBClassPath(IFacetedProject project) {
- if (!J2EEUtils.isEJBComponent(project.getProject())) return;
- IProject ejbProject = project.getProject();
- IJavaProject javaProject = JavaCore.create(ejbProject);
- Path projectRoot = new Path(Path.ROOT.append(new Path(ejbProject.getName())).toString());
- IPath ejbModulePath = projectRoot.append("ejbModule");
- try {
- IClasspathEntry[] originalSet = javaProject.getRawClasspath();
- boolean foundEJBModulEntry = false;
- for (IClasspathEntry entry : originalSet) {
- if (entry.getPath().equals(ejbModulePath))
- foundEJBModulEntry = true;
- }
- if (!foundEJBModulEntry) {
- IClasspathEntry[] newSet = new IClasspathEntry[originalSet.length + 1];
- int i=0;
-
- for (IClasspathEntry entry : originalSet) {
- newSet[i++] = entry;
- }
- newSet[i] = JavaCore.newSourceEntry(ejbModulePath);
- javaProject.setRawClasspath(newSet,null);
- }
- }
- catch (Exception e) {
- // TODO: handle exception
- }
-
- }
-
- public IStatus createNewFacetedProject(final String projectName) {
- final IStatus[] status = new IStatus[1];
- status[0] = Status.OK_STATUS;
- IProject project = ProjectUtilities.getProject(projectName);
- if (!project.exists()) {
- // Create a runnable that creates a new faceted project.
- IRunnableWithProgress runnable = new IRunnableWithProgress() {
- public void run(IProgressMonitor shellMonitor) throws InvocationTargetException, InterruptedException {
- try {
- IFacetedProject fProject = ProjectFacetsManager.create(projectName, null, shellMonitor);
- if (fProject == null) {
- status[0] = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_PROJECT_CREATION, new String[] { projectName }));
- }
- } catch (CoreException e) {
- status[0] = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_PROJECT_CREATION, new String[] { projectName }), e);
- }
- }
- };
-
- // Run the runnable in another thread unless there is no UI thread (Ant scenarios)
- try {
- if (displayPresent()) {
- PlatformUI.getWorkbench().getProgressService().run(true, false, runnable);
- } else {
- try {
- IFacetedProject fProject = ProjectFacetsManager.create(projectName, null, null);
- if (fProject == null) {
- status[0] = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_PROJECT_CREATION, new String[] { projectName }));
- }
- } catch (CoreException e) {
- status[0] = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_PROJECT_CREATION, new String[] { projectName }), e);
- }
- }
- } catch (InvocationTargetException ite) {
- status[0] = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_PROJECT_CREATION, new String[] { projectName }), ite);
- } catch (InterruptedException ie) {
- status[0] = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_PROJECT_CREATION, new String[] { projectName }), ie);
- }
- }
-
- return status[0];
- }
-
- public IStatus setFacetRuntimeOnProject(final IFacetedProject fProject, final IRuntime fRuntime) {
- final IStatus[] status = new IStatus[1];
- status[0] = Status.OK_STATUS;
-
- // Create a runnable that sets the facet runtime on the faceted project
- IRunnableWithProgress runnable = new IRunnableWithProgress() {
- public void run(IProgressMonitor shellMonitor) throws InvocationTargetException, InterruptedException {
- try {
- fProject.setTargetedRuntimes(Collections.singleton(fRuntime), shellMonitor);
- } catch (CoreException e) {
- status[0] = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_SETTING_RUNTIME, new String[] { fProject.getProject().getName(), fRuntime.getName() }), e);
- }
- }
- };
-
- // Run the runnable in another thread unless there is no UI thread (Ant scenarios)
- if (displayPresent()) {
- try {
- PlatformUI.getWorkbench().getProgressService().run(true, false, runnable);
- } catch (InvocationTargetException ite) {
- status[0] = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_SETTING_RUNTIME, new String[] { fProject.getProject().getName(), fRuntime.getName() }), ite);
- } catch (InterruptedException ie) {
- status[0] = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_SETTING_RUNTIME, new String[] { fProject.getProject().getName(), fRuntime.getName() }), ie);
- }
- } else {
- try {
- fProject.setTargetedRuntimes(Collections.singleton(fRuntime), null);
-
- } catch (CoreException e) {
- status[0] = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_SETTING_RUNTIME, new String[] { fProject.getProject().getName(), fRuntime.getName() }), e);
- }
- }
-
- return status[0];
- }
-
- public IStatus setFixedFacetsOnProject(final IFacetedProject fProject, final Set fixedFacets) {
- final IStatus[] status = new IStatus[1];
- status[0] = Status.OK_STATUS;
-
- // Create a runnable that sets the fixed facets on the faceted project
- IRunnableWithProgress runnable = new IRunnableWithProgress() {
- public void run(IProgressMonitor shellMonitor) throws InvocationTargetException, InterruptedException {
- try {
- fProject.setFixedProjectFacets(fixedFacets);
- } catch (CoreException e) {
- status[0] = getErrorStatusForSettingFixedFacets(fProject.getProject().getName(), fixedFacets, e);
- }
- }
- };
-
- // Run the runnable in another thread unless there is no UI thread (Ant scenarios)
- if (displayPresent()) {
- try {
- PlatformUI.getWorkbench().getProgressService().run(true, false, runnable);
- } catch (InvocationTargetException ite) {
- status[0] = getErrorStatusForSettingFixedFacets(fProject.getProject().getName(), fixedFacets, ite);
- } catch (InterruptedException ie) {
- status[0] = getErrorStatusForSettingFixedFacets(fProject.getProject().getName(), fixedFacets, ie);
- }
- } else {
- try {
- fProject.setFixedProjectFacets(fixedFacets);
- } catch (CoreException e) {
- status[0] = getErrorStatusForSettingFixedFacets(fProject.getProject().getName(), fixedFacets, e);
- }
- }
-
- return status[0];
- }
-
- // Check to see if SWT is active and the Display is present or not
- private static boolean displayPresent() {
- Bundle b = Platform.getBundle("org.eclipse.swt");
- if (b == null) {
- return false;
- }
- if ((b.getState() != Bundle.RESOLVED && b.getState() != Bundle.ACTIVE)) {
- return false;
- }
- try {
- if (Display.getCurrent() == null) {
- return false;
- } else {
- return true;
- }
- } catch (NoClassDefFoundError e1) {
- return false;
- } catch (Exception e) {
- // if the Display class cannot be loaded for whatever reason
- return false;
-
- }
- }
-
- // the following private methods had to be copied from FacetUtils
- /**
- * Returns a translatable delimited list of facet labels derived from the
- * provided set of facets
- *
- * @param facets
- * a set containing elements of type {@link IProjectFacet}
- * @return String a delimited list of facet labels
- */
- private static String getFacetListMessageString(Set facets) {
- String facetListMessage = "";
- int size = facets.size();
- if (size > 0) {
- Iterator itr = facets.iterator();
- IProjectFacet firstProjectFacet = (IProjectFacet) itr.next();
- facetListMessage = firstProjectFacet.getLabel();
-
- // Continue appending to facetListMessage until all the facet labels
- // are in the list.
- while (itr.hasNext()) {
- IProjectFacet projectFacet = (IProjectFacet) itr.next();
- String pfLabel = projectFacet.getLabel();
- facetListMessage = NLS.bind(ConsumptionMessages.MSG_FACETS, new String[] { facetListMessage, pfLabel });
- }
- }
-
- return facetListMessage;
- }
-
- /**
- * Returns an error status indicating that the facets could not be set as
- * fixed facets on the faceted project
- *
- * @param projectName
- * a project name to insert in the error message in the IStatus
- * @param facets
- * a set containing elements of type {@link IProjectFacet}. The
- * facets in this set will be listed in the error message in the
- * IStatus.
- * @param t
- * a Throwable which will be inserted in the IStatus
- * @return an IStatus with severity IStatus.ERROR
- */
- private static IStatus getErrorStatusForSettingFixedFacets(String projectName, Set facets, Throwable t) {
- IStatus status = Status.OK_STATUS;
- int size = facets.size();
- if (size > 0) {
- String facetList = getFacetListMessageString(facets);
- status = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_FIXED_FACETS, new String[] { projectName, facetList }), t);
- }
-
- return status;
- }
-
- /**
- * Returns an error status indicating that the facet versions could not be
- * added to the faceted project
- *
- * @param projectName
- * a project name to insert in the error message in the IStatus
- * @param projectFacetVersions
- * a set containing elements of type {@link IProjectFacetVersion}
- * . The facets in this set will be listed in the error message
- * in the IStatus.
- * @param t
- * a Throwable which will be inserted in the IStatus
- * @return an IStatus with severity IStatus.ERROR
- */
- private static IStatus getErrorStatusForAddingFacets(String projectName, Set projectFacetVersions, Throwable t) {
- IStatus status = Status.OK_STATUS;
- int size = projectFacetVersions.size();
- if (size > 0) {
- Set facets = new HashSet();
- // Iterate over projectFacetVersions to form a set of IProjectFacets
- Iterator itr = projectFacetVersions.iterator();
- while (itr.hasNext()) {
- IProjectFacetVersion projectFacet = (IProjectFacetVersion) itr.next();
- IProjectFacet facet = projectFacet.getProjectFacet();
- facets.add(facet);
- }
- String facetList = getFacetListMessageString(facets);
- status = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_ADDING_FACETS_TO_PROJECT, new String[] { projectName, facetList }), t);
- }
-
- return status;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/FinishFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/FinishFragment.java
deleted file mode 100644
index cd8e709..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/FinishFragment.java
+++ /dev/null
@@ -1,35 +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 May 4, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.ws.internal.consumption.ui.common;
-
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishTestFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-
-
-/**
- * @author gilberta
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class FinishFragment extends SequenceFragment
-{
- public FinishFragment()
- {
- add(new FinishTestFragment() );
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/HandlerDescriptionHelper.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/HandlerDescriptionHelper.java
deleted file mode 100644
index de63bbb..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/HandlerDescriptionHelper.java
+++ /dev/null
@@ -1,67 +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
- * 20060404 134913 sengpl@ca.ibm.com - Seng Phung-Lu
- * -------- -------- -----------------------------------------------------------
- */
-package org.eclipse.jst.ws.internal.consumption.ui.common;
-
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-
-
-
-public class HandlerDescriptionHelper {
-
- /**
- * Helper method for getting the HandlerDescriptorHolder given the name
- * @param hdhs
- * @param descName
- * @return
- */
- public static HandlerDescriptionHolder getForDescriptionName(HandlerDescriptionHolder[] hdhs, String descName){
- for (int i=0;i<hdhs.length;i++){
- String name = hdhs[i].getDescriptionName();
- if (name!=null && name.equals(descName)){
- return hdhs[i];
- }
- }
- return null;
- }
-
- /**
- * Helper method for getting all description names
- * @param hdhs
- * @return
- */
- public static String[] getAllDescriptionNames(HandlerDescriptionHolder[] hdhs){
- String[] names = new String[hdhs.length];
- for(int i=0;i<hdhs.length;i++){
- names[i]=hdhs[i].getDescriptionName();
- }
- return names;
- }
-
- public static String[] getAllHandlerClassNames(HandlerDescriptionHolder[] hdhs){
- Vector v = new Vector();
- for (int i=0;i<hdhs.length;i++){
- List list = hdhs[i].getHandlerList();
- if (list!=null && !list.isEmpty()){
- for (int j=0;j<list.size();j++){
- HandlerTableItem hti = (HandlerTableItem)list.get(j);
- v.add(hti.getHandlerClassName());
- }
- }
- }
- return (String[])v.toArray(new String[0]);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/HandlerDescriptionHolder.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/HandlerDescriptionHolder.java
deleted file mode 100644
index 00cbadd..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/HandlerDescriptionHolder.java
+++ /dev/null
@@ -1,137 +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
- * -------- -------- -----------------------------------------------------------
- * 20060404 134913 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060518 142554 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.common;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.webservice.wsdd.Handler;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddFactoryImpl;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-
-
-public class HandlerDescriptionHolder {
-
- private String descriptionName;
- private List handlerList;
- private WebServiceDescription descriptionObject;
- private IPath sourceOutputPath;
-
-
- public IPath getSourceOutputPath() {
- return sourceOutputPath;
- }
-
- public void setSourceOutputPath(IPath sourceOutputPath) {
- this.sourceOutputPath = sourceOutputPath;
- }
-
- public IProject getProject(){
- if (descriptionObject!=null)
- return ProjectUtilities.getProject(descriptionObject);
- else
- return null;
- }
-
- /*
- * get the WebServiceDescription object
- */
- public WebServiceDescription getDescriptionObject() {
- return descriptionObject;
- }
-
- /**
- * set WebServiceDescription object
- * @param descriptionObject
- */
- public void setDescriptionObject(WebServiceDescription descriptionObject) {
- this.descriptionObject = descriptionObject;
- }
-
- /**
- * get Description name
- * @return
- */
- public String getDescriptionName() {
- return descriptionName;
- }
-
- /**
- * set Description name
- * @param descriptionName
- */
- public void setDescriptionName(String descriptionName) {
- this.descriptionName = descriptionName;
- }
-
- /**
- * get List of HandlerTableItem associated with this service description
- * @return
- */
- public List getHandlerList() {
- return handlerList;
- }
-
- /**
- * set List of HandlerTableItem associated with this service description
- * @param handlerList
- */
- public void setHandlerList(List handlerList) {
- this.handlerList = handlerList;
- }
-
- public void addHandlerToAllPorts(){
-
- if (handlerList!=null && !handlerList.isEmpty()){
-
- for (int z=0;z<handlerList.size();z++){
- HandlerTableItem hti = (HandlerTableItem)handlerList.get(z);
- if (descriptionObject!=null) {
- List portComponents = descriptionObject.getPortComponents();
- for (int x=0;x<portComponents.size();x++){
- PortComponent wsPort = (PortComponent) portComponents.get(x);
- List wsHandlers = wsPort.getHandlers();
- if (wsHandlers!=null){
- boolean alreadyExists = false;
- for (int y=0;y<wsHandlers.size();y++){
- Handler handler = (Handler)wsHandlers.get(y);
- if (handler.getHandlerClass().equals(hti.getHandlerClassName())){
- alreadyExists = true;
- }
- }
-
- if (!alreadyExists) {
- //create it and add to the list
- WsddFactory wsddFactory = new WsddFactoryImpl();
- Handler newHandler = wsddFactory.createHandler();
- newHandler.setHandlerName(hti.getHandlerName());
- newHandler.setHandlerClass(hti.getHandlerClassName());
- wsHandlers.add(newHandler);
- }
- }
- }
- }
- }
- }
-
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/HandlerServiceRefHelper.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/HandlerServiceRefHelper.java
deleted file mode 100644
index 3daff3b..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/HandlerServiceRefHelper.java
+++ /dev/null
@@ -1,72 +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
- * 20060404 134913 sengpl@ca.ibm.com - Seng Phung-Lu
- * -------- -------- -----------------------------------------------------------
- */
-package org.eclipse.jst.ws.internal.consumption.ui.common;
-
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-
-
-public class HandlerServiceRefHelper {
-
- /**
- * Helper method for getting the HandlerServiceRefHolder given the name
- * @param hsrh
- * @param descName
- * @return
- */
- public static HandlerServiceRefHolder getForServiceRefName(HandlerServiceRefHolder[] hsrh, String descName){
- for (int i=0;i<hsrh.length;i++){
- String name = hsrh[i].getServiceRefName();
- if (name!=null && name.equals(descName)){
- return hsrh[i];
- }
- }
- return null;
- }
-
- /**
- * Gets all the handler Class names associated with each service ref
- * @param hsrh
- * @return
- */
- public static String[] getAllHandlerClassNames(HandlerServiceRefHolder[] hsrh){
- Vector v = new Vector();
- for (int i=0;i<hsrh.length;i++){
- List list = hsrh[i].getHandlerList();
- if (list!=null && !list.isEmpty()){
- for (int j=0;j<list.size();j++){
- HandlerTableItem hti = (HandlerTableItem)list.get(j);
- v.add(hti.getHandlerClassName());
- }
- }
- }
- return (String[])v.toArray(new String[0]);
- }
-
- /**
- * Get all the service Ref names
- * @param hsrh
- * @return
- */
- public static String[] getAllServiceRefNames(HandlerServiceRefHolder[] hsrh){
- String[] names = new String[hsrh.length];
- for(int i=0;i<hsrh.length;i++){
- names[i]=hsrh[i].getServiceRefName();
- }
- return names;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/HandlerServiceRefHolder.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/HandlerServiceRefHolder.java
deleted file mode 100644
index b1b004b..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/HandlerServiceRefHolder.java
+++ /dev/null
@@ -1,118 +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
- * -------- -------- -----------------------------------------------------------
- * 20060404 134913sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060517 142339 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.common;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.webservice.wsclient.Handler;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.Webservice_clientFactoryImpl;
-import org.eclipse.jst.ws.internal.common.JavaMOFUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-
-
-public class HandlerServiceRefHolder {
-
- private String serviceRefName;
- private List handlerList;
- private ServiceRef serviceRef;
- private IPath sourceOutputPath;
-
- public IPath getSourceOutputPath() {
- return sourceOutputPath;
- }
-
- public void setSourceOutputPath(IPath sourceOutputPath) {
- this.sourceOutputPath = sourceOutputPath;
- }
-
- public IProject getProject() {
- if (serviceRef!=null)
- return ProjectUtilities.getProject(serviceRef);
- else
- return null;
- }
-
- public List getHandlerList() {
- return handlerList;
- }
-
- public void setHandlerList(List handlerList) {
- this.handlerList = handlerList;
- }
-
- public ServiceRef getServiceRef() {
- return serviceRef;
- }
-
- public void setServiceRef(ServiceRef serviceRef) {
- this.serviceRef = serviceRef;
- }
-
- public String getServiceRefName() {
- return serviceRefName;
- }
-
- public void setServiceRefName(String serviceRefName) {
- this.serviceRefName = serviceRefName;
- }
-
- public void addHandlerToServiceRef(){
- if (handlerList!=null && !handlerList.isEmpty()){
-
- for (int x=0;x<handlerList.size();x++){
- HandlerTableItem hti = (HandlerTableItem)handlerList.get(x);
- if (serviceRef!=null){
- List existingHandlers = serviceRef.getHandlers();
- boolean alreadyExists = false;
- for (int i=0;i<existingHandlers.size();i++){
- Handler handler = (Handler)existingHandlers.get(i);
- if (handler.getHandlerClass().getJavaName().equals(hti.getHandlerClassName())){
- alreadyExists = true;
- }
- }
-
- if (!alreadyExists) {
-
- Webservice_clientFactory wsClientFactory = new Webservice_clientFactoryImpl();
- Handler newHandler = wsClientFactory.createHandler();
- newHandler.setHandlerName(hti.getHandlerName());
- try {
- IProject project = ProjectUtilities.getProject(serviceRef);
- if (project!=null) {
- JavaClass javaClass = JavaMOFUtils.getJavaClass(hti.getHandlerClassName(), project);
- if (javaClass != null) {
- newHandler.setHandlerClass(javaClass);
- }
- existingHandlers.add(newHandler);
- }
- }
- catch(Exception e){
- e.printStackTrace();
- }
- }
-
- }
-
- }
- }
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/LabelsAndIds.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/LabelsAndIds.java
deleted file mode 100644
index a4a6016..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/LabelsAndIds.java
+++ /dev/null
@@ -1,65 +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
- * -------- -------- -----------------------------------------------------------
- * 20080221 146023 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080425 221232 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080616 237298 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080619 237797 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-/**
- */
-package org.eclipse.jst.ws.internal.consumption.ui.common;
-
-import java.util.Vector;
-
-public class LabelsAndIds
-{
- private Vector labels_ = new Vector();
- private Vector ids_ = new Vector();
-
-
- public void add(String id, String label){
- ids_.add(id);
- labels_.add(label);
- }
-
- public int size(){
- return labels_.size();
- }
-
- public String getId(int index){
- if (index < 0 || index + 1 > ids_.size()) return null;
- return (String)ids_.get(index);
- }
-
- public void clear(){
- labels_.clear();
- ids_.clear();
- }
-
- /**
- * @return Returns the ids_.
- */
- public String[] getIds()
- {
- String[] stringArray = new String[ids_.size()];
- ids_.copyInto(stringArray);
- return stringArray;
- }
-
- public String[] getLabels()
- {
- String[] stringArray = new String[ids_.size()];
- labels_.copyInto(stringArray);
- return stringArray;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ScenarioCleanupCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ScenarioCleanupCommand.java
deleted file mode 100644
index a9b44f6..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ScenarioCleanupCommand.java
+++ /dev/null
@@ -1,52 +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
- * -------- -------- -----------------------------------------------------------
- * 20060825 155114 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.common;
-
-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.common.WSDLParserFactory;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionRegistry;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * This command is intended to clean up data after either the
- * client or service wizards. Currently is just resets the
- * parser factory.
- *
- */
-public class ScenarioCleanupCommand extends AbstractDataModelOperation
-{
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- WSDLParserFactory.killParser();
- ObjectSelectionRegistry.getInstance().cleanup();
-
- return Status.OK_STATUS;
- }
-
-
- public IStatus undo( IProgressMonitor monitor, IAdaptable adaptable )
- {
- // Even if the user cancels out of the wizard we want to
- // kill the parser.
- WSDLParserFactory.killParser();
- ObjectSelectionRegistry.getInstance().cleanup();
-
- return Status.OK_STATUS;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ServerSelectionUtils.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ServerSelectionUtils.java
deleted file mode 100644
index 2adfab0..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ServerSelectionUtils.java
+++ /dev/null
@@ -1,133 +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
- * -------- -------- -----------------------------------------------------------
- * 20060324 116750 rsinha@ca.ibm.com - Rupam Kuehner
- * 20070119 159458 mahutch@ca.ibm.com - Mark Hutchinson
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.common;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.ws.internal.consumption.common.IServerDefaulter;
-import org.eclipse.jst.ws.internal.consumption.common.ServerInfo;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IRuntimeType;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-
-
-public class ServerSelectionUtils
-{
-
- public static IRuntime getRuntimeTarget(String projectName)
- {
- if( projectName != null && projectName.length() > 0 ){ //$NON-NLS-1$
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- if( project != null && project.exists() ){
- return ServerCore.getProjectProperties(project).getRuntimeTarget();
- }
- }
- return null;
- }
-
- public static IServer getFirstExistingServerFromFactoryId(String factoryId)
- {
- IServer[] servers = ServerCore.getServers();
- if (servers==null || servers.length!=0)
- return null;
- else
- {
- for (int i=0; i<servers.length; i++)
- {
- IServer server = (IServer)servers[i];
- if (server.getServerType().getId().equals(factoryId))
- {
- return server;
- }
- }
- }
- return null;
- }
-
- public static IServer[] getCompatibleExistingServers(IRuntime runtime)
- {
- if (runtime == null)
- return null;
-
- IServer[] servers = ServerCore.getServers();
- if (servers==null || servers.length==0)
- return null;
-
- ArrayList compatibleServersList = new ArrayList();
- IRuntimeType runtimeType = runtime.getRuntimeType();
- if (runtimeType != null)
- {
- String runtimeId = runtimeType.getId();
- for (int i=0; i<servers.length; i++)
- {
- IServer server = (IServer)servers[i];
- IRuntimeType runtimeType2 = server.getRuntime().getRuntimeType();
- if (runtimeType2 != null)
- {
- String serverRuntimeId = runtimeType2.getId();
- if (serverRuntimeId.equals(runtimeId))
- compatibleServersList.add(server);
- }
-
- }
- }
- if (compatibleServersList.size()<1)
- return null;
-
-
- Object[] compatibleServersArray = compatibleServersList.toArray();
- IServer[] compatibleServers = new IServer[compatibleServersArray.length];
- for (int j=0; j<compatibleServersArray.length; j++)
- {
- compatibleServers[j] = (IServer)compatibleServersArray[j];
- }
-
- return compatibleServers;
- }
-
- public static ServerInfo getExtenderRecommendation(IProject project)
- {
- try
- {
- IExtensionRegistry reg = Platform.getExtensionRegistry();
- IConfigurationElement[] elements = reg.getConfigurationElementsFor("org.eclipse.jst.ws.consumption", "serverDefaulter");
- for (int i=0; i<elements.length; i++)
- {
- Object serverDefaulterObject = elements[i].createExecutableExtension("class");
- if (serverDefaulterObject instanceof IServerDefaulter)
- {
- IServerDefaulter serverDefaulter = (IServerDefaulter)serverDefaulterObject;
- ServerInfo serverInfo = serverDefaulter.recommendDefaultServer(project);
- if (serverInfo != null)
- return serverInfo;
- }
-
- }
- } catch (CoreException ce)
- {
- return null;
- }
-
- return null;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ValidationUtils.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ValidationUtils.java
deleted file mode 100644
index 9ddc496..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ValidationUtils.java
+++ /dev/null
@@ -1,1104 +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
- * -------- -------- -----------------------------------------------------------
- * 20060222 115834 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060413 135581 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060420 136158 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060420 136705 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060421 136761 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060425 137831 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060427 126780 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060427 138058 joan@ca.ibm.com - Joan Haggarty
- * 20060905 156230 kathy@ca.ibm.com - Kathy Chan, Handling projects with no target runtime
- * 20070119 159458 mahutch@ca.ibm.com - Mark Hutchinson
- * 20070723 194434 kathy@ca.ibm.com - Kathy Chan, Check for non-existing EAR with content not deleted
- * 20071107 203826 kathy@ca.ibm.com - Kathy Chan
- * 20071130 203826 kathy@ca.ibm.com - Kathy Chan
- * 20080205 170141 kathy@ca.ibm.com - Kathy Chan
- * 20080416 215084 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080417 227599 kathy@ca.ibm.com - Kathy Chan
- * 20080717 241283 ericdp@ca.ibm.com - Eric D. Peters, Class version error when invoking sample JSP on Tomcat 5.5 when Java project is Java 6
- * 20081001 243869 ericdp@ca.ibm.com - Eric D. Peters, Web Service tools allowing mixed J2EE levels
- * 20090121 261730 zhang@ca.ibm.com - Allan Zhang, WebService client runtime id return null
- * 20090302 249602 ericdp@ca.ibm.com - Eric D. Peters, PII- association warning message needs update
- * 20090401 269994 ericdp@ca.ibm.com - Eric D. Peters, NLS- Validation messages unclear when servers don't support runtime/project combo
- * 20100511 309395 mahutch@ca.ibm.com - Mark Hutchinson, WS Wizard Converting Java Project into Utility Project without any warning
- * 20101207 332067 mahutch@ca.ibm.com - Mark Hutchinson, Consider server in web service wizard validation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.common;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.j2ee.webservice.internal.WebServiceConstants;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.WSDLPort;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServices;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddResource;
-import org.eclipse.jst.server.core.FacetUtil;
-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.common.FacetUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.RuntimeDescriptor;
-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.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
-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;
-import org.eclipse.wst.common.project.facet.core.VersionFormatException;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IRuntimeType;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntimeChecker;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-/**
- *
- */
-public class ValidationUtils
-{
- //Constants to help decide how much validation to do.
- public static final int VALIDATE_NONE = 0;
- public static final int VALIDATE_ALL = 1;
- public static final int VALIDATE_SERVER_RUNTIME_CHANGES = 2;
- public static final int VALIDATE_PROJECT_CHANGES = 3;
- public static final int VALIDATE_SCALE_CHANGES = 4;
-
- /**
- *
- */
- public ValidationUtils()
- {
- }
-
- /**
- * Returns a new validation state based on the current validation state
- * and the requested validation state. If the requested validation state
- * does not cover all the validation covered by the current validation
- * state, VALIDATE_ALL is returned. Otherwise, the requested validation
- * state is returned.
- *
- * @param currentValidationState the validaton state at the time the caller's requests a change
- * @param requestedValidationState the validation state being requested by the caller.
- * @return Returns VALIDATE_ALL if the requested validation state
- * does not cover all the validation covered by the current validation
- * state. Returned requestedValidationState otherwise.
- */
- public int getNewValidationState(int currentValidationState, int requestedValidationState) {
- int newValidationState;
- if (currentValidationState == VALIDATE_NONE
- || currentValidationState == requestedValidationState) {
- newValidationState = requestedValidationState;
- } else {
- newValidationState = VALIDATE_ALL;
- }
-
- return newValidationState;
-
- }
-
- /**
- * Returns IStatus resulting from checking for empty fields. Used for validation of page 1 of the
- * Web service/client wizards.
- * @param validationState one of VALIDATE_NONE, VALIDATE_ALL, VALIDATE_SERVER_RUNTIME_CHANGES, VALIDATE_PROJECT_CHANGES, VALIDATE_SCALE_CHANGES
- * @param typeId Web service type id (isClient=false) or Web service client implementation type id (isClient=true)
- * @param serviceImpl String representation of the object selection from page 1
- * @param runtimeId Web service runtime id
- * @param serverId server type id
- * @param projectName name of project
- * @param needEar boolean <code>true</code> if EAR is required, <code>false</code> if not.
- * @param earProjectName name of EAR project
- * @param projectTypeId template id
- * @param isClient boolean <code>true</code> if the method is being called for client side validation,
- * <code>false</code> for service side validation.
- * @return IStatus with severity IStatus.OK if all mandatory fields are non-null and non-empty.
- * IStatus with severity IStatus.ERROR otherwise.
- */
- public IStatus checkMissingFieldStatus(int validationState, String typeId, String serviceImpl, String runtimeId, String serverId,
- String projectName, boolean needEar, String earProjectName, String projectTypeId,
- boolean isClient)
- {
- // Object selection
- if (validationState==VALIDATE_ALL && !isClient)
- {
- if (serviceImpl.length() == 0) {
- int scenario = WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(typeId);
- if (scenario == WebServiceScenario.BOTTOMUP)
- {
- return StatusUtils
- .errorStatus(ConsumptionUIMessages.MSG_NO_OBJECT_SELECTION);
- }
- else
- {
- return StatusUtils
- .errorStatus(ConsumptionUIMessages.MSG_NO_SERVICE_SELECTION);
- }
- }
- }
-
- // Web service runtime
- if (validationState == VALIDATE_ALL || validationState == VALIDATE_SERVER_RUNTIME_CHANGES) {
- if (runtimeId == null || runtimeId.length() == 0) {
- if (isClient) {
- return StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_NO_RUNTIME,
- new String[] { ConsumptionUIMessages.MSG_CLIENT_SUB }));
- } else {
- return StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_NO_RUNTIME,
- new String[] { ConsumptionUIMessages.MSG_SERVICE_SUB }));
- }
- }
- }
-
- if (validationState == VALIDATE_ALL || validationState == VALIDATE_PROJECT_CHANGES) {
- // Project
- if (projectName == null || projectName.length() == 0) {
- if (isClient) {
- return StatusUtils.errorStatus(NLS.bind(
- ConsumptionUIMessages.MSG_CLIENT_PROJECT_EMPTY, new String[] { "" }));
- } else {
- return StatusUtils.errorStatus(NLS.bind(
- ConsumptionUIMessages.MSG_SERVICE_PROJECT_EMPTY, new String[] { "" }));
- }
- }
-
- // Project type (if project does not exist)
- IProject project = ProjectUtilities.getProject(projectName);
- if (!project.exists()) {
- if (projectTypeId == null || projectTypeId.length() == 0) {
-
- if (isClient) {
- return StatusUtils
- .errorStatus(ConsumptionUIMessages.MSG_CLIENT_PROJECT_TYPE_EMPTY);
- } else {
- return StatusUtils
- .errorStatus(ConsumptionUIMessages.MSG_SERVICE_PROJECT_TYPE_EMPTY);
- }
- }
- }
-
- // Ear (if need ear)
- if (needEar) {
- if (earProjectName == null || earProjectName.length() == 0) {
- if (isClient) {
- return StatusUtils.errorStatus(NLS.bind(
- ConsumptionUIMessages.MSG_CLIENT_EAR_EMPTY, new String[] { "" }));
- } else {
- return StatusUtils.errorStatus(NLS.bind(
- ConsumptionUIMessages.MSG_SERVICE_EAR_EMPTY, new String[] { "" }));
- }
- }
- }
- }
-
- // Server (if Web service runtime requires a server or project does not
- // exist)
- if (validationState == VALIDATE_ALL || validationState == VALIDATE_SERVER_RUNTIME_CHANGES
- || validationState == VALIDATE_PROJECT_CHANGES) {
- if (serverId == null || serverId.length() == 0) {
- RuntimeDescriptor desc = WebServiceRuntimeExtensionUtils2.getRuntimeById(runtimeId);
- if (desc.getServerRequired()) {
- if (isClient) {
- StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_NO_SERVER,
- new String[] { ConsumptionUIMessages.MSG_CLIENT_SUB }));
- } else {
- StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_NO_SERVER,
- new String[] { ConsumptionUIMessages.MSG_SERVICE_SUB }));
- }
- } else {
- IProject project = ProjectUtilities.getProject(projectName);
- if (!project.exists()) {
- return StatusUtils.errorStatus(NLS.bind(
- ConsumptionUIMessages.MSG_PROJECT_MUST_EXIST,
- new String[] { projectName }));
-
- }
- }
- }
- }
-
- return Status.OK_STATUS;
- }
-
- /**
- * Returns IStatus resulting from checking for errors. Used for validation of page 1 of the
- * Web service/client wizards.
- * @param validationState one of VALIDATE_NONE, VALIDATE_ALL, VALIDATE_SERVER_RUNTIME_CHANGES, VALIDATE_PROJECT_CHANGES, VALIDATE_SCALE_CHANGES
- * @param typeRuntimeServer Web service runtime, type and server
- * @param projectName name of project
- * @param needEar boolean <code>true</code> if EAR is required, <code>false</code> if not.
- * @param earProjectName name of EAR project
- * @param projectTypeId template id
- * @param isClient boolean <code>true</code> if the method is being called for client side validation,
- * <code>false</code> for service side validation.
- * @return IStatus with severity IStatus.OK if no errors are present,
- * IStatus with severity IStatus.ERROR otherwise.
- */
- public IStatus checkErrorStatus(int validationState, TypeRuntimeServer typeRuntimeServer, String projectName, String initialProjectName, boolean needEar, String earProjectName, String projectTypeId,
- boolean isClient) {
-
- // Ensure server, Web service runtime, and Web service type are
- // compatible
-
- String typeId = typeRuntimeServer.getTypeId();
- String runtimeId = typeRuntimeServer.getRuntimeId();
- String serverId = typeRuntimeServer.getServerId();
- String serverInstanceId = typeRuntimeServer.getServerInstanceId();
-
- // Labels
- String serverLabel = "";
- if (serverId != null && serverId.length()>0)
- {
- serverLabel = WebServiceRuntimeExtensionUtils2.getServerLabelById(serverId);
- }
- String runtimeLabel = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(runtimeId);
-
- if (validationState == VALIDATE_ALL || validationState == VALIDATE_SERVER_RUNTIME_CHANGES) {
- if (serverId != null && serverId.length() > 0) {
- if (isClient) {
- if (!WebServiceRuntimeExtensionUtils2
- .isServerClientRuntimeTypeSupported(serverId,
- runtimeId, typeId)) {
- return StatusUtils
- .errorStatus(NLS
- .bind(
- ConsumptionUIMessages.MSG_INVALID_SRT_SELECTIONS,
- new String[] { serverLabel,
- runtimeLabel }));
- }
- } else {
- if (!WebServiceRuntimeExtensionUtils2
- .isServerRuntimeTypeSupported(serverId, runtimeId,
- typeId)) {
- return StatusUtils
- .errorStatus(NLS
- .bind(
- ConsumptionUIMessages.MSG_INVALID_SRT_SELECTIONS,
- new String[] { serverLabel,
- runtimeLabel }));
- }
-
- if (initialProjectName != "" && serverId != null && !projectName.equals(initialProjectName) &&
- (WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(typeId) == WebServiceScenario.BOTTOMUP) &&
- J2EEUtils.isJavaComponent(ProjectUtilities.getProject(initialProjectName))){
-
- if(!doesServerSupportProject(serverId,initialProjectName)){
- return StatusUtils.errorStatus(NLS.bind(
- ConsumptionUIMessages.MSG_SERVICE_SERVER_DOES_NOT_SUPPORT_JAVAPROJECT,
- new String[] { serverLabel, initialProjectName }));
- }
- }
- }
- }
-
- }
-
- // If the project exists, ensure it supports the Web service type, Web
- // service runtime, and server. If the Ear also exists and the project
- // and Ear are not already associated, ensure they can be.
- // If the project does not exist, ensure the project type supports the
- // Web service type, Web service runtime, and server
- if (validationState == VALIDATE_ALL || validationState == VALIDATE_SERVER_RUNTIME_CHANGES
- || validationState == VALIDATE_PROJECT_CHANGES) {
- ValidationUtils valUtils = new ValidationUtils();
- IProject project = ProjectUtilities.getProject(projectName);
- if (project.exists()) {
-
- if (isClient) {
- // Check if the runtime supports it.
- if (!WebServiceRuntimeExtensionUtils2.doesClientTypeAndRuntimeSupportProject(
- typeId, runtimeId, projectName)) {
- return StatusUtils.errorStatus(NLS.bind(
- ConsumptionUIMessages.MSG_CLIENT_RUNTIME_DOES_NOT_SUPPORT_PROJECT,
- new String[] { runtimeLabel, serverLabel, projectName }));
- }
-
- // Check if the server supports it.
- if (serverId != null && serverId.length() > 0) {
- if (!valUtils.doesServerSupportProject(serverId, projectName)) {
- return StatusUtils.errorStatus(NLS.bind(
- ConsumptionUIMessages.MSG_CLIENT_SERVER_DOES_NOT_SUPPORT_PROJECT,
- new String[] { serverLabel, projectName }));
- }
- }
- } else {
- // Check if the runtime supports it.
- if (!WebServiceRuntimeExtensionUtils2.doesServiceTypeAndRuntimeSupportProject(
- typeId, runtimeId, projectName)) {
- return StatusUtils.errorStatus(NLS.bind(
- ConsumptionUIMessages.MSG_SERVICE_RUNTIME_DOES_NOT_SUPPORT_PROJECT,
- new String[] { runtimeLabel, serverLabel, projectName }));
- }
-
- // Check if the server supports it.
- if (serverId != null && serverId.length() > 0)
- {
- if (!valUtils.doesServerSupportProject(serverId, projectName)) {
- return StatusUtils.errorStatus(NLS.bind(
- ConsumptionUIMessages.MSG_SERVICE_SERVER_DOES_NOT_SUPPORT_PROJECT,
- new String[] { serverLabel, projectName }));
- }
- }
- }
- } else {
- // Look at the project type to ensure that it is suitable for
- // the
- // selected runtime and server.
- String templateId = projectTypeId;
- String templateLabel = FacetUtils.getTemplateLabelById(templateId);
-
- if (isClient) {
- // Check if the runtime supports it.
- if (!WebServiceRuntimeExtensionUtils2.doesClientTypeAndRuntimeSupportTemplate(
- typeId, runtimeId, templateId, serverId)) {
-
- return StatusUtils.errorStatus(NLS.bind(
- ConsumptionUIMessages.MSG_CLIENT_RUNTIME_DOES_NOT_SUPPORT_TEMPLATE,
- new String[] { runtimeLabel, serverLabel, templateLabel }));
- }
-
- // Check if the server supports it.
- if (serverId != null && serverId.length()>0)
- {
- if (!valUtils.doesServerSupportTemplate(serverId, templateId)) {
- return StatusUtils.errorStatus(NLS.bind(
- ConsumptionUIMessages.MSG_CLIENT_SERVER_DOES_NOT_SUPPORT_TEMPLATE,
- new String[] { serverLabel, templateLabel }));
- }
- }
-
- if (WebServiceRuntimeExtensionUtils2.getClientRuntimeId(typeRuntimeServer, projectName, projectTypeId) == "")
- {
- return StatusUtils.errorStatus(NLS.bind(
- ConsumptionUIMessages.MSG_CLIENT_RUNTIME_DOES_NOT_SUPPORT_TEMPLATE,
- new String[] { runtimeLabel, serverLabel, templateLabel }));
- }
-
- } else {
- // Check if the runtime supports it.
- if (!WebServiceRuntimeExtensionUtils2.doesServiceTypeAndRuntimeSupportTemplate(
- typeId, runtimeId, templateId, serverId)) {
- return StatusUtils
- .errorStatus(NLS
- .bind(
- ConsumptionUIMessages.MSG_SERVICE_RUNTIME_DOES_NOT_SUPPORT_TEMPLATE,
- new String[] { runtimeLabel, serverLabel, templateLabel }));
- }
-
- // Check if the server supports it.
- if (serverId != null && serverId.length()>0)
- {
- if (!valUtils.doesServerSupportTemplate(serverId, templateId)) {
- return StatusUtils.errorStatus(NLS.bind(
- ConsumptionUIMessages.MSG_SERVICE_SERVER_DOES_NOT_SUPPORT_TEMPLATE,
- new String[] { serverLabel, templateLabel }));
- }
- }
- }
-
- }
-
- }
-
- if (validationState == VALIDATE_ALL || validationState == VALIDATE_PROJECT_CHANGES) {
- // Check if project/EAR association is good.
- if (needEar) {
- IProject project = ProjectUtilities.getProject(projectName);
- IProject ep = ProjectUtilities.getProject(earProjectName);
-
- // 194434 - Check for non-existing EAR with contents that's not deleted previously
- IStatus canCreateEARStatus = J2EEUtils.canCreateEAR(ep);
- if (!canCreateEARStatus.isOK()) {
- return canCreateEARStatus;
- }
-
- if (project.exists() && ep.exists()) {
- if (!J2EEUtils.isComponentAssociated(ep, project)) {
- boolean associateStatus = J2EEUtils.canAssociateProjectToEARWithoutWarning(project, ep);
- if (!associateStatus) {
- if (isClient) {
- return StatusUtils.warningStatus(NLS.bind(
- ConsumptionUIMessages.MSG_CLIENT_CANNOT_ASSOCIATE,
- new String[] { projectName, ep.getName()}));
- } else {
- return StatusUtils.warningStatus(NLS.bind(
- ConsumptionUIMessages.MSG_SERVICE_CANNOT_ASSOCIATE,
- new String[] { projectName, ep.getName()}));
- }
- }
- }
- }
- }
- }
-
- // Defect 203826 - Give extender a way to veto server, project, project type and EAR choices
- if (validationState == VALIDATE_ALL || validationState == VALIDATE_SERVER_RUNTIME_CHANGES
- || validationState == VALIDATE_PROJECT_CHANGES) {
- TypeRuntimeServer trs = new TypeRuntimeServer();
- trs.setTypeId(typeId);
- trs.setRuntimeId(runtimeId);
- trs.setServerId(serverId);
- IWebServiceRuntimeChecker runtimeChecker = null;
- if (isClient) {
- String clientRuntimeId = WebServiceRuntimeExtensionUtils2.getClientRuntimeId(trs, projectName, projectTypeId);
- runtimeChecker = WebServiceRuntimeExtensionUtils2.getClientRuntimeChecker(clientRuntimeId);
-
- } else {
- String serviceRuntimeId = WebServiceRuntimeExtensionUtils2.getServiceRuntimeId(trs, projectName, projectTypeId);
- runtimeChecker = WebServiceRuntimeExtensionUtils2.getServiceRuntimeChecker(serviceRuntimeId);
- }
- if (runtimeChecker != null) {
- return runtimeChecker.checkRuntimeCompatibility(serverId, serverInstanceId, projectName, projectTypeId, earProjectName);
- }
- }
-
- return Status.OK_STATUS;
-
- }
-
- /**
- * Returns IStatus resulting from checking for warnings. Used for validation of page 1 of the
- * Web service/client wizards.
- * @param validationState one of VALIDATE_NONE, VALIDATE_ALL, VALIDATE_SERVER_RUNTIME_CHANGES, VALIDATE_PROJECT_CHANGES, VALIDATE_SCALE_CHANGES
- * @param scaleSetting one of <BR/>
- * ScenarioContext.WS_TEST<BR/>
- * ScenarioContext.WS_START<BR/>
- * ScenarioContext.WS_INSTALL<BR/>
- * ScenarioContext.WS_DEPLOY<BR/>
- * ScenarioContext.WS_ASSEMBLE<BR/>
- * ScenarioContext.WS_DEVELOP<BR/>
- * ScenarioContext.WS_NONE
- * @param serverId server type id
- * @param serverId server instance id
- * @param isClient boolean <code>true</code> if the method is being called for client side validation,
- * <code>false</code> for service side validation.
- * @return IStatus with severity IStatus.OK if no errors are present,
- * IStatus with severity IStatus.WARNING otherwise.
- */
- public IStatus checkWarningStatus(int validationState, int scaleSetting, String serverId,
- String serverInstanceId, boolean isClient) {
- return checkWarningStatus(validationState, scaleSetting, serverId, serverInstanceId, isClient, null, null, null);
- }
-
- /**
- * Returns IStatus resulting from checking for warnings. Used for validation of page 1 of the
- * Web service/client wizards.
- * @param validationState one of VALIDATE_NONE, VALIDATE_ALL, VALIDATE_SERVER_RUNTIME_CHANGES, VALIDATE_PROJECT_CHANGES, VALIDATE_SCALE_CHANGES
- * @param scaleSetting one of <BR/>
- * ScenarioContext.WS_TEST<BR/>
- * ScenarioContext.WS_START<BR/>
- * ScenarioContext.WS_INSTALL<BR/>
- * ScenarioContext.WS_DEPLOY<BR/>
- * ScenarioContext.WS_ASSEMBLE<BR/>
- * ScenarioContext.WS_DEVELOP<BR/>
- * ScenarioContext.WS_NONE
- * @param serverId server type id
- * @param serverId server instance id
- * @param isClient boolean <code>true</code> if the method is being called for client side validation,
- * <code>false</code> for service side validation.
- * @return IStatus with severity IStatus.OK if no errors are present,
- * IStatus with severity IStatus.WARNING otherwise.
- */
- public IStatus checkWarningStatus(int validationState, int scaleSetting, String serverId,
- String serverInstanceId, boolean isClient, String projectName, IProject initialProject, String typeId) {
- // Return a warning if there is no server selection and scale setting is
- // anything beyond assemble.
- if (validationState == VALIDATE_ALL || validationState == VALIDATE_SCALE_CHANGES
- || validationState == VALIDATE_SERVER_RUNTIME_CHANGES) {
- if (serverId == null || serverId.length() == 0) {
- if (scaleSetting < ScenarioContext.WS_ASSEMBLE) {
- if (isClient) {
- return StatusUtils.warningStatus(NLS.bind(
- ConsumptionUIMessages.MSG_WARN_NO_CLIENT_SERVER, new String[0]));
- } else {
- return StatusUtils.warningStatus(NLS.bind(
- ConsumptionUIMessages.MSG_WARN_NO_SERVICE_SERVER, new String[0]));
- }
- }
- } else {
- // Return a warning if the selected server has only stub
- // runtimes
- // and the scale setting is anything beyond deploy.
- IServerType serverType = ServerCore.findServerType(serverId);
- if (serverType != null) {
- // Find a Runtime which is not a stub
- IRuntime nonStubRuntime = ServerUtils.getNonStubRuntime(serverId);
- if ((scaleSetting < ScenarioContext.WS_DEPLOY) && nonStubRuntime == null && serverInstanceId == null) {
- String servertypeLabel = WebServiceRuntimeExtensionUtils2
- .getServerLabelById(serverId);
- return StatusUtils.warningStatus(NLS.bind(
- ConsumptionUIMessages.MSG_WARN_STUB_ONLY,
- new String[] { servertypeLabel }));
- }
- }
-
- }
- }
- //return a warning in bottom up scenarios where the intial project will be converted into a java utility project
- if (initialProject != null && projectName != null && !projectName.equals(initialProject.getName()) && !JavaEEProjectUtilities.isUtilityProject(initialProject) && FacetUtils.isJavaProject(initialProject) &&
- (WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(typeId) == WebServiceScenario.BOTTOMUP)){
- return StatusUtils.warningStatus(NLS.bind(ConsumptionUIMessages.MSG_WARN_CONVERTED_TO_UTIL, initialProject.getName()));
- }
-
- return Status.OK_STATUS;
-
- }
-
- /**
- * Returns whether or not the provided server type supports the facet versions on the provided project
- * @param serverFactoryId server type id
- * @param projectName name of a project that may or may not exist.
- * @return boolean <code>true</code> if the server type supports the facet versions on the project (facets versions are inferred from a Java project),
- * <code>false</code> if the server type does not support the facet versions or facet versions on the project cannot be determined. */
- public boolean doesServerSupportProject(String serverFactoryId, String projectName)
- {
- Set facets = FacetUtils.getFacetsForProject(projectName);
- if (facets == null)
- return true;
- else
- return doesServerSupportFacets(serverFactoryId, facets);
- }
-
- /**
- * Returns whether or not the provided server type supports the facet versions in the provided set.
- * @param serverFactoryId server type id
- * @param facets set containing elements of type {@link IProjectFacetVersion}
- * @return boolean <code>true</code> if the server type supports the facet versions in the provided set,
- * <code>false</code> otherwise.
- */
- public boolean doesServerSupportFacets(String serverFactoryId, Set facets)
- {
- Set runtimes = FacetUtils.getRuntimes(new Set[]{facets});
- Iterator itr = runtimes.iterator();
- IServerType st = ServerCore.findServerType(serverFactoryId);
- String runtimeTypeId = st.getRuntimeType().getId();
- while (itr.hasNext())
- {
- org.eclipse.wst.common.project.facet.core.runtime.IRuntime fRuntime = (org.eclipse.wst.common.project.facet.core.runtime.IRuntime)itr.next();
- IRuntime sRuntime = FacetUtil.getRuntime(fRuntime);
- if (sRuntime != null)
- {
- IRuntimeType runtimeType = sRuntime.getRuntimeType();
- if (runtimeType != null && runtimeTypeId.equals(runtimeType.getId()))
- {
- //found a match
- return true;
- }
- }
- }
-
- return false;
- }
-
- /**
- * Returns whether or not the provided server type supports at least one version of
- * each of the fixed facets on the provided template
- * @param serverFactoryId server type id
- * @param templateId id of a {@link IFacetedProjectTemplate}
- * @return boolean <code>true</code> if the server type supports at least one version of
- * each of the fixed facets on the provided template, <code>false</code> otherwise.
- */
- public boolean doesServerSupportTemplate(String serverFactoryId, String templateId)
- {
- IFacetedProjectTemplate template = ProjectFacetsManager.getTemplate(templateId);
- Set templateFacets = template.getFixedProjectFacets();
- Iterator templateFacetsItr = templateFacets.iterator();
- while (templateFacetsItr.hasNext())
- {
- boolean serverSupportsThisOne = false;
- IProjectFacet fixedFacet = (IProjectFacet)templateFacetsItr.next();
- List versions = null;
- try
- {
- versions = fixedFacet.getSortedVersions(true);
- } catch (VersionFormatException e)
- {
- Set versionSet = fixedFacet.getVersions();
- Iterator itr = versionSet.iterator();
- versions = new ArrayList();
- while (itr.hasNext())
- {
- versions.add(itr.next());
- }
- } catch (CoreException e)
- {
- Set versionSet = fixedFacet.getVersions();
- Iterator itr = versionSet.iterator();
- versions = new ArrayList();
- while (itr.hasNext())
- {
- versions.add(itr.next());
- }
- }
- Iterator versionsItr = versions.iterator();
- while(versionsItr.hasNext())
- {
- IProjectFacetVersion pfv = (IProjectFacetVersion)versionsItr.next();
- Set pfvs = new HashSet();
- pfvs.add(pfv);
- if (doesServerSupportFacets(serverFactoryId, pfvs))
- {
- serverSupportsThisOne = true;
- break;
- }
- }
-
- if (!serverSupportsThisOne)
- {
- return false;
- }
- }
-
- return true;
- }
-
- /**
- * Returns whether or not the provided project or project type (if the project is null or does not exist)
- * rules out the need for an EAR.
- * @param projectName name of a project
- * @param projectTypeId id of a {@link IFacetedProjectTemplate}. Must be non-empty if the project is null or
- * does not exist.
- * @return boolean <code>true</code> if the need for an EAR is not ruled out, <code>false</code> otherwise.
- */
- public boolean projectOrProjectTypeNeedsEar(String projectName, String projectTypeId)
- {
- // If the project is a simple Java project or the project type is
- // Java utility return false.
- if (projectName != null && projectName.length() > 0) {
- IProject project = ResourceUtils.getWorkspaceRoot().getProject(projectName);
- if (project.exists()) {
- if (FacetUtils.isJavaProject(project)) {
- return false;
- }
- }
- }
-
- // Project didn't rule out the need for an EAR
- // so check the proect type
- String templateId = projectTypeId;
- if (templateId != null && templateId.length() > 0) {
- if (FacetUtils.isUtilityTemplate(templateId)) {
- return false;
- }
- }
-
- return true;
- }
-
- /**
- * Returns whether or not an J2EE 1.3 EAR project can be installed on a server of
- * the provided server type.
- * @param serverTypeId server type id
- * @return boolean <code>true</code> if a J2EE 1.3 EAR project can be installed on a server of
- * the provided server type, <code>false</code> otherwise.
- */
- public boolean serverNeedsEAR(String serverTypeId)
- {
- if (serverTypeId == null) {
- return false;
- }
- if (serverTypeId.length() > 0) {
- String targetId = ServerUtils.getRuntimeTargetIdFromFactoryId(serverTypeId);
- if (targetId != null && targetId.length() > 0) {
- if (!ServerUtils.isTargetValidForEAR(targetId, "13")) // rm j2ee
- {
- return false;
- }
- }
- }
-
- return true;
- }
-
- public IStatus validateProjectTargetAndJ2EE(String projectName, String compName, String earName, String earCompName, String serverFactoryId, String j2eeLevel)
- {
- IProject p = ProjectUtilities.getProject(projectName);
- IProject earP = null;
- if (earName!=null && !earName.equalsIgnoreCase("")) {
- earP = ProjectUtilities.getProject(earName);
- }
- IStatus targetStatus = doesProjectTargetMatchServerType(p, serverFactoryId);
- if (earP!=null && targetStatus.getSeverity()==Status.OK)
- {
- //check the EAR
- IStatus earTargetStatus = doesProjectTargetMatchServerType(earP, serverFactoryId);
- if(earTargetStatus.getSeverity()==Status.ERROR)
- {
- return earTargetStatus;
- }
- }
- else
- {
- return targetStatus;
- }
-
-
- //Validate service side J2EE level
- IStatus j2eeStatus = doesProjectMatchJ2EELevel(p, compName, j2eeLevel);
- if(earP!=null && j2eeStatus.getSeverity()==Status.OK)
- {
- IStatus earJ2EEStatus = doesProjectMatchJ2EELevel(earP, earCompName, j2eeLevel);
- if(earJ2EEStatus.getSeverity()==Status.ERROR)
- {
- return earJ2EEStatus;
- }
- }
- else
- {
- return j2eeStatus;
- }
-
- return Status.OK_STATUS;
- }
-
- //TODO: This method is obselete - should be removed.
- private IStatus doesProjectTargetMatchServerType(IProject p, String serverFactoryId)
- {
- if (p!=null && p.exists())
- {
- IRuntime projectTarget = ServerSelectionUtils.getRuntimeTarget(p.getName());
- if (projectTarget!=null)
- {
- String projectTargetId = projectTarget.getRuntimeType().getId();
- String serverTargetId = ServerUtils.getRuntimeTargetIdFromFactoryId(serverFactoryId);
- if (serverTargetId!=null && serverTargetId.length()>0)
- {
- if(!projectTargetId.equals(serverTargetId))
- {
- return StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_SERVER_TARGET_MISMATCH,new String[]{p.getName()}) );
- }
- }
- }
- }
- return Status.OK_STATUS;
- }
-
- //TODO: This method is obselete - should be removed.
- private IStatus doesProjectMatchJ2EELevel(IProject p, String compName, String j2eeLevel)
- {
-
- try {
- if (p!=null && p.exists())
- {
- int projectJ2EELevel = J2EEUtils.getJ2EEVersion(p);
- if (projectJ2EELevel!=-1)
- {
- String projectJ2EELevelString = String.valueOf(projectJ2EELevel);
- if (j2eeLevel!=null && j2eeLevel.length()>0)
- {
- if (!projectJ2EELevelString.equals(j2eeLevel))
- {
- return StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_J2EE_MISMATCH,new String[]{p.getName()}) );
- }
- }
- }
- }
- } catch(Exception e){
-
- }
-
- return Status.OK_STATUS;
- }
-
- //TODO: This method is obselete - should be removed.
- public IStatus validateProjectType(String projectName, SelectionListChoices runtime2ClientTypes)
- {
- IStatus status = Status.OK_STATUS;
- IProject p = ProjectUtilities.getProject(projectName);
- if (p==null || !p.exists())
- {
- //Project does not exist which means a new project of the correct type will be created
- //We're done. All is good.
- return status;
- }
-
- //If the project exists, we should see it in the project list for the selected client
- //project type.
- String[] projectNames = runtime2ClientTypes.getChoice().getChoice().getList().getList();
- for (int i=0; i<projectNames.length; i++)
- {
- if (projectName.equals(projectNames[i]))
- {
- //Found the project. All is good.
- return status;
- }
- }
-
- //Didn't find the project. Return an error.
- //Get the label for the client type id
- String clientTypeLabel = getClientTypeLabel(runtime2ClientTypes.getChoice().getList().getSelection());
- String message = NLS.bind(ConsumptionUIMessages.MSG_WRONG_CLIENT_PROJECT_TYPE,new String[]{projectName, clientTypeLabel});
- IStatus eStatus = StatusUtils.errorStatus( message );
- return eStatus;
-
- }
-
- //TODO: This method is obselete - should be removed.
- private String getClientTypeLabel( String type )
- {
- if (type.equals(IModuleConstants.JST_WEB_MODULE))
- {
- return ConsumptionUIMessages.LABEL_CLIENT_COMP_TYPE_WEB;
- }
- else if (type.equals(IModuleConstants.JST_EJB_MODULE))
- {
- return ConsumptionUIMessages.LABEL_CLIENT_COMP_TYPE_EJB;
- }
- else if (type.equals(IModuleConstants.JST_APPCLIENT_MODULE))
- {
- return ConsumptionUIMessages.LABEL_CLIENT_COMP_TYPE_APP_CLIENT;
- }
- else if (type.equals(IModuleConstants.JST_UTILITY_MODULE))
- {
- return ConsumptionUIMessages.LABEL_CLIENT_COMP_TYPE_CONTAINERLESS;
- }
- else
- {
- //No known label, return the typeId itself.
- return type;
- }
- }
-
- /**
- * Returns whether or not this project is likely hosting any of the services
- * in the provided WSDL as a J2EE Web service.
- * @param p IProject in the workspace
- * @param wsdlURL URL of a WSDL document
- * @param parser
- * @return boolean <code>true</code> if the project contains a webservices.xml
- * deployment descriptor that points to at least one of the ports in the provided WSDL.
- * Returns <code>false</code> otherwise.
- */
- public boolean isProjectServiceProject(IProject p, String wsdlURL, WebServicesParser parser)
- {
- if (p==null || wsdlURL==null || wsdlURL.length()==0 || parser==null)
- return false;
-
- IResource wsXML = getWebServcesXML(p);
- if (wsXML==null)
- return false;
-
-
- //Make a list of all the wsdl-port's in webservices.xml
- if (!(wsXML instanceof IFile))
- {
- return false;
- }
-
- Resource res = WorkbenchResourceHelperBase.getResource((IFile)wsXML, true);
- WsddResource wsddRes = (WsddResource)res;
- WebServices webServices = wsddRes.getWebServices();
- Iterator wsDescs = webServices.getWebServiceDescriptions().iterator();
- ArrayList wsdlPortList = new ArrayList();
- while(wsDescs.hasNext())
- {
- WebServiceDescription wsDesc = (WebServiceDescription)wsDescs.next();
- Iterator pcs = wsDesc.getPortComponents().iterator();
- while(pcs.hasNext())
- {
- PortComponent pc = (PortComponent)pcs.next();
- WSDLPort wsdlPort = pc.getWsdlPort();
- wsdlPortList.add(new QualifiedName(wsdlPort.getNamespaceURI(), wsdlPort.getLocalPart()));
- }
- }
-
- ArrayList portList = getPortNamesFromWsdl(wsdlURL, parser);
-
- //If any of the QualifiedNames in portList equals any of the QualifiedNames
- //in wsdlPortList, this is the service project. Return true.
- Object[] ports = portList.toArray();
- Object[] wsdlPorts = wsdlPortList.toArray();
- for (int i = 0; i < ports.length; i++)
- {
- QualifiedName portName = (QualifiedName) ports[i];
- for (int j = 0; j < wsdlPorts.length; j++)
- {
- QualifiedName wsdlPortName = (QualifiedName) wsdlPorts[j];
- if (portName.equals(wsdlPortName))
- {
- return true;
- }
- }
- }
-
- return false;
- }
-
- /**
- * Returns the IResource corresponding to the webservices.xml in the provided project.
- * @param p an IProject in the workspace.
- * @return IResource corresponding to the webservices.xml in the provided project,
- * null if there is no webservices.xml in the project.
- */
- private IResource getWebServcesXML(IProject p)
- {
- //Get the module root.
- IResource moduleRoot = getModuleRoot(p);
- if (!(moduleRoot instanceof IContainer))
- return null;
-
- IResource webServicesXML = null;
- if (J2EEProjectUtilities.isDynamicWebProject(p))
- {
- StringBuffer wsPath = new StringBuffer();
- wsPath.append("WEB-INF/");
- wsPath.append(WebServiceConstants.WEBSERVICE_DD_SHORT_NAME);
- webServicesXML = ((IContainer) moduleRoot).findMember(wsPath.toString());
- }
- else
- {
- StringBuffer wsPath = new StringBuffer();
- wsPath.append("META-INF/");
- wsPath.append(WebServiceConstants.WEBSERVICE_DD_SHORT_NAME);
- webServicesXML = ((IContainer) moduleRoot).findMember(wsPath.toString());
- }
- return webServicesXML;
- }
-
- private IResource getModuleRoot(IProject p)
- {
- IPath modulePath = null;
- try
- {
- IVirtualComponent vc = ComponentCore.createComponent(p);
- if (vc != null)
- {
- modulePath = vc.getRootFolder().getWorkspaceRelativePath();
- }
- }
- catch(Exception ex)
- {
-
- }
-
- IResource res = ResourceUtils.findResource(modulePath);
- return res;
- }
-
- /**
- * Returns a list of WSDL ports in the provided WSDL
- * @param wsdlURL URL of a WSDL document
- * @param parser
- * @return ArrayList containing elements of type {@link QualifiedName}
- */
- private ArrayList getPortNamesFromWsdl(String wsdlURL, WebServicesParser parser)
- {
- ArrayList portNameList = new ArrayList();
- Definition def = parser.getWSDLDefinition(wsdlURL);
- Map services = def.getServices();
- Service service = null;
- for (Iterator it = services.values().iterator(); it.hasNext();)
- {
- service = (Service)it.next();
- String namespace = service.getQName().getNamespaceURI();
- Map ports = service.getPorts();
- for (Iterator it2 = ports.values().iterator(); it2.hasNext();)
- {
- Port port = (Port)it2.next();
- portNameList.add(new QualifiedName(namespace, port.getName()));
- }
- }
-
- return portNameList;
-
- }
-
- private class QualifiedName
- {
- String namespaceURI;
-
- String localPart;
-
- /**
- * @param namespaceURI
- * @param localPart
- */
- public QualifiedName(String namespaceURI, String localPart)
- {
- super();
- this.namespaceURI = namespaceURI;
- this.localPart = localPart;
- }
-
- /**
- * @return Returns the localPart.
- */
- public String getLocalPart()
- {
- return localPart;
- }
-
- /**
- * @param localPart
- * The localPart to set.
- */
- public void setLocalPart(String localPart)
- {
- this.localPart = localPart;
- }
-
- /**
- * @return Returns the namespaceURI.
- */
- public String getNamespaceURI()
- {
- return namespaceURI;
- }
-
- /**
- * @param namespaceURI
- * The namespaceURI to set.
- */
- public void setNamespaceURI(String namespaceURI)
- {
- this.namespaceURI = namespaceURI;
- }
-
- public boolean equals(QualifiedName qn)
- {
- return (qn.getNamespaceURI().equals(namespaceURI) && qn.getLocalPart()
- .equals(localPart));
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/ClientRootFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/ClientRootFragment.java
deleted file mode 100644
index 3e4feac..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/ClientRootFragment.java
+++ /dev/null
@@ -1,117 +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
- * -------- -------- -----------------------------------------------------------
- * 20060131 121071 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060529 141422 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.extension;
-
-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.AssembleClientFragment;
-import org.eclipse.wst.ws.internal.extensions.DeployClientFragment;
-import org.eclipse.wst.ws.internal.extensions.DevelopClientFragment;
-import org.eclipse.wst.ws.internal.extensions.InstallClientFragment;
-import org.eclipse.wst.ws.internal.extensions.RunClientFragment;
-
-public class ClientRootFragment extends SequenceFragment
-{
- public ClientRootFragment()
- {
- add( new SimpleFragment( new PreClientDevelopCommand(), "" ) );
- add( new DevelopClientFragment() );
- add( new SimpleFragment( new PreClientAssembleCommand(), "" ) );
- add( new AssembleClientFragment() );
- add( new SimpleFragment( new PreClientDeployCommand(), "" ) );
- add( new DeployClientFragment() );
- add( new SimpleFragment( new PreClientInstallCommand(), "" ) );
- add( new InstallClientFragment() );
- add( new SimpleFragment( new PreClientRunCommand(),
- "org.eclipse.jst.ws.internal.consumption.ui.extension.PreClientRunCommand" ) );
- add( new RunClientFragment() );
- }
-
- public void registerDataMappings(DataMappingRegistry registry)
- {
- registry.addMapping( PreClientDevelopCommand.class, "WebService", DevelopClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Environment", DevelopClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Context", DevelopClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Selection", DevelopClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Project", DevelopClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Module", DevelopClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "EarProject", DevelopClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Ear", DevelopClientFragment.class );
-
- // Map the PreClientDevelopCommand into the dataObject.
- registry.addMapping( PreClientDevelopCommand.class, "DataObject", DataObjectCommand.class );
-
- registry.addMapping( PreClientDevelopCommand.class, "WebService", AssembleClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Environment", AssembleClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Context", AssembleClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Selection", AssembleClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Project", AssembleClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Module", AssembleClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "EarProject", AssembleClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Ear", AssembleClientFragment.class );
-
- registry.addMapping( PreClientDevelopCommand.class, "WebService", DeployClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Environment", DeployClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Context", DeployClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Selection", DeployClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Project", DeployClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Module", DeployClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "EarProject", DeployClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Ear", DeployClientFragment.class );
-
- registry.addMapping( PreClientDevelopCommand.class, "WebService", InstallClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Environment", InstallClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Context", InstallClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Selection", InstallClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Project", InstallClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Module", InstallClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "EarProject", InstallClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Ear", InstallClientFragment.class );
-
- registry.addMapping( PreClientDevelopCommand.class, "WebService", RunClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Environment", RunClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Context", RunClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Selection", RunClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Project", RunClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Module", RunClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "EarProject", RunClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Ear", RunClientFragment.class );
-
- //Mappings from framework to framework commands
- registry.addMapping( PreClientDevelopCommand.class, "Context", PreClientAssembleCommand.class );
- registry.addMapping( PreClientDevelopCommand.class, "Context", PreClientDeployCommand.class );
-
- registry.addMapping( PreClientDevelopCommand.class, "WebService", PreClientAssembleCommand.class );
- registry.addMapping( PreClientDevelopCommand.class, "Project", PreClientAssembleCommand.class );
- registry.addMapping( PreClientDevelopCommand.class, "Module", PreClientAssembleCommand.class );
- registry.addMapping( PreClientDevelopCommand.class, "EarProject", PreClientAssembleCommand.class );
- registry.addMapping( PreClientDevelopCommand.class, "Ear", PreClientAssembleCommand.class );
-
- registry.addMapping( PreClientDevelopCommand.class, "WebService", PreClientInstallCommand.class );
- registry.addMapping( PreClientDevelopCommand.class, "Project", PreClientInstallCommand.class );
- registry.addMapping( PreClientDevelopCommand.class, "Context", PreClientInstallCommand.class );
- registry.addMapping( PreClientDevelopCommand.class, "Module", PreClientInstallCommand.class );
- registry.addMapping( PreClientDevelopCommand.class, "EarProject", PreClientInstallCommand.class );
- registry.addMapping( PreClientDevelopCommand.class, "Ear", PreClientInstallCommand.class );
-
- registry.addMapping( PreClientDevelopCommand.class, "WebService", PreClientRunCommand.class );
- registry.addMapping( PreClientDevelopCommand.class, "Context", PreClientRunCommand.class );
-
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientAssembleCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientAssembleCommand.java
deleted file mode 100644
index 37e5d48..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientAssembleCommand.java
+++ /dev/null
@@ -1,117 +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
- * -------- -------- -----------------------------------------------------------
- * 20060131 121071 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060529 141422 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.extension;
-
-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.j2ee.internal.plugin.IJ2EEModuleConstants;
-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.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.IWebServiceClient;
-
-public class PreClientAssembleCommand extends AbstractDataModelOperation
-{
- private IWebServiceClient webServiceClient_;
- private String project_;
- private String module_;
- private String earProject_;
- private String ear_;
- private IContext context_;
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IStatus status = Status.OK_STATUS;
-
- if (context_ != null && context_.getAssemble()) {
- IEnvironment environment = getEnvironment();
-
- // Check if EAR module is req'd, ie. !=null
- if (earProject_==null)
- return Status.OK_STATUS;
-
- // Create the client 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(webServiceClient_.getWebServiceClientInfo().getServerFactoryId());
- command.setServerInstanceId(webServiceClient_.getWebServiceClientInfo().getServerInstanceId());
- status = command.execute( monitor, adaptable );
- if (status.getSeverity() == Status.ERROR)
- {
- environment.getStatusHandler().reportError( status );
- return status;
- }
-
-
- //Associate the client 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, adaptable );
- if (status.getSeverity()==Status.ERROR)
- {
- environment.getStatusHandler().reportError( status );
- }
-
- }
- return 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( IWebServiceClient webServiceClient )
- {
- webServiceClient_ = webServiceClient;
- }
-
- public void setContext (IContext context) {
- context_ = context;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDeployCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDeployCommand.java
deleted file mode 100644
index cb571d8..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDeployCommand.java
+++ /dev/null
@@ -1,44 +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
- * 20060529 141422 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.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 PreClientDeployCommand extends AbstractDataModelOperation
-{
- private IContext context_;
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- if (context_ != null && 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.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDevelopCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDevelopCommand.java
deleted file mode 100644
index db2cc0c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDevelopCommand.java
+++ /dev/null
@@ -1,317 +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
- * -------- -------- -----------------------------------------------------------
- * 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
- * 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.extension;
-
-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.util.emf.workbench.ProjectUtilities;
-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.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-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.ISelection;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntime;
-import org.eclipse.wst.ws.internal.wsrt.SimpleContext;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceClientInfo;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceState;
-
-public class PreClientDevelopCommand extends AbstractDataModelOperation
-{
-
- private TypeRuntimeServer typeRuntimeServer_;
- private String clientRuntimeId_;
- private IContext context_;
- private ISelection selection_;
- private String project_;
- private String module_;
- private String moduleType_;
- private String earProject_;
- private String ear_;
- private IWebServiceClient webServiceClient_;
- private String j2eeLevel_;
- private ResourceContext resourceContext_;
- private boolean develop_;
- private boolean assemble_;
- private boolean deploy_;
- private boolean test_;
- private boolean install_;
- private boolean run_;
- private String wsdlURI_;
- private Object dataObject_;
-
- 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);
- }
- }
-
- environment.getLog().log(ILog.INFO, "ws_framework", 5108, this, "PreClientDevelopCommand", "clientRuntimeId_ = "+ clientRuntimeId_);
- IWebServiceRuntime wsrt = WebServiceRuntimeExtensionUtils2
- .getClientRuntime(clientRuntimeId_);
- WebServiceClientInfo wsInfo = new WebServiceClientInfo();
-
- wsInfo.setServerFactoryId(typeRuntimeServer_.getServerId());
- wsInfo.setServerInstanceId(typeRuntimeServer_.getServerInstanceId());
- wsInfo.setState(WebServiceState.UNKNOWN_LITERAL);
- wsInfo.setWebServiceRuntimeId(typeRuntimeServer_.getRuntimeId());
-
- // check for redirection in the wsdl
- HTTPUtility httpUtil = new HTTPUtility();
- String newWsdlURL = httpUtil.handleRedirect(wsdlURI_);
-
- 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;
- }
-
- webServiceClient_ = wsrt.getWebServiceClient(wsInfo);
- WebServiceScenario scenario = WebServiceScenario.CLIENT_LITERAL;
- context_ = new SimpleContext(develop_, assemble_, deploy_, install_, run_, true, test_,
- false, scenario, resourceContext_.isOverwriteFilesEnabled(),
- resourceContext_.isCreateFoldersEnabled(), resourceContext_
- .isCheckoutFilesEnabled());
-
- // Create the client module if needed.
- IProject project = ProjectUtilities.getProject(project_);
- RequiredFacetVersion[] rfv = WebServiceRuntimeExtensionUtils2.getClientRuntimeDescriptorById(clientRuntimeId_).getRequiredFacetVersions();
- if (!project.exists())
- {
- boolean matches = WebServiceRuntimeExtensionUtils2.doesClientRuntimeSupportTemplate(clientRuntimeId_, 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;
- }
- }
- }
- }
- return status;
- }
-
- public void setClientTypeRuntimeServer( TypeRuntimeServer typeRuntimeServer )
- {
- typeRuntimeServer_ = typeRuntimeServer;
- }
-
- public void setClientRuntimeId( String id)
- {
- clientRuntimeId_ = id;
- }
-
- public void setClientJ2EEVersion( String j2eeLevel )
- {
- j2eeLevel_ = j2eeLevel;
- }
-
- public String getJ2eeLevel()
- {
- return j2eeLevel_;
- }
-
- public IWebServiceClient getWebService()
- {
- return webServiceClient_;
- }
-
- 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 moduleType)
- {
- moduleType_ = moduleType;
- }
-
- public String getEarProject()
- {
- return earProject_;
- }
-
- public String getEar()
- {
- return ear_;
- }
-
- public void setEar( String ear )
- {
- ear_ = ear;
- }
-
- public void setDevelopClient(boolean developClient) {
- develop_ = developClient;
- }
-
- public void setAssembleClient(boolean assembleClient) {
- assemble_ = assembleClient;
- }
-
- public void setDeployClient(boolean deployClient)
- {
- deploy_ = deployClient;
- }
-
- public void setInstallClient(boolean installClient)
- {
- install_ = installClient;
- }
-
- public void setTestService(boolean testService)
- {
- test_ = testService;
- }
-
- public void setStartService(boolean startService)
- {
- run_ = startService;
- }
-
- public void setWsdlURI(String uri)
- {
- wsdlURI_ = uri;
- }
-
- public void setDataObject( Object object )
- {
- dataObject_ = object;
- }
-
- public Object getDataObject()
- {
- Object result = null;
-
- if( dataObject_ != null && dataObject_ instanceof IWebService )
- {
- // The data object has already been set with an IWebService
- // so we will keep this value.
- result = dataObject_;
- }
- else
- {
- result = webServiceClient_;
- }
-
- return result;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientInstallCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientInstallCommand.java
deleted file mode 100644
index 181f9f3..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientInstallCommand.java
+++ /dev/null
@@ -1,146 +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
- * -------- -------- -----------------------------------------------------------
- * 20060529 141422 kathy@ca.ibm.com - Kathy Chan
- * 20070815 199626 kathy@ca.ibm.com - Kathy Chan
- * 20071130 203826 kathy@ca.ibm.com - Kathy Chan
- * 20080425 220985 trungha@ca.ibm.com - Trung Ha, 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
- * 20080722 240231 gilberta@ca.ibm.com - Gilbert Andrews
- * 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.consumption.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.IWebServiceClient;
-
-public class PreClientInstallCommand extends AbstractDataModelOperation
-{
- private IWebServiceClient webServiceClient_;
- private String project_;
- private String module_;
- private String earProject_;
- private String ear_;
- private IContext context_;
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- if (context_ != null && context_.getInstall())
- {
- IEnvironment environment = getEnvironment();
-
- if (webServiceClient_.getWebServiceClientInfo().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(
- webServiceClient_.getWebServiceClientInfo().getServerFactoryId())) {
-
- webServiceClient_.getWebServiceClientInfo().setServerInstanceId(oneServer.getId());
- webServiceClient_.getWebServiceClientInfo().setServerCreated(true);
- }
- }
- }
- // Cannot find an appropriate server, so we will create one
- if (webServiceClient_.getWebServiceClientInfo().getServerInstanceId() == null) {
- CreateServerCommand createServerCommand = new CreateServerCommand();
- createServerCommand.setServerFactoryid(webServiceClient_.getWebServiceClientInfo().getServerFactoryId());
- createServerCommand.setServerRuntimeId(webServiceClient_.getWebServiceClientInfo().getServerRuntimeId());
- createServerCommand.setEnvironment( environment );
- IStatus createServerStatus = createServerCommand.execute(null, null);
- if (createServerStatus.getSeverity()==Status.OK)
- {
- webServiceClient_.getWebServiceClientInfo().setServerInstanceId(createServerCommand.getServerInstanceId());
- webServiceClient_.getWebServiceClientInfo().setServerCreated(true);
- }
- else
- {
- if (createServerStatus.getSeverity()==Status.ERROR)
- {
- environment.getStatusHandler().reportError( createServerStatus );
- }
- return createServerStatus;
- }
- }
- }
-
- AddModuleToServerCommand command = new AddModuleToServerCommand();
- command.setServerInstanceId(webServiceClient_.getWebServiceClientInfo().getServerInstanceId());
- command.setEarProject(earProject_);
- command.setEarModule(ear_);
- command.setProject(project_);
- command.setModule(module_);
-
- command.setEnvironment( environment );
- IStatus status = command.execute( null, null );
- if (status.getSeverity()==Status.ERROR)
- {
- environment.getStatusHandler().reportError( status );
- }
- return status;
- }
- return Status.OK_STATUS;
- }
-
- public void setProject( String project )
- {
- project_ = project;
- }
-
- public boolean getCanRunTestClient(){
- if(webServiceClient_.getWebServiceClientInfo().getServerInstanceId() != null) return true;
-
- return false;
- }
-
- public void setModule( String module )
- {
- module_ = module;
- }
-
- public void setEarProject( String earProject )
- {
- earProject_ = earProject;
- }
-
- public void setEar( String ear )
- {
- ear_ = ear;
- }
-
- public void setWebService( IWebServiceClient webServiceClient )
- {
- webServiceClient_ = webServiceClient;
- }
-
- public void setContext(IContext context)
- {
- context_ = context;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientRunCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientRunCommand.java
deleted file mode 100644
index 59315bf..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientRunCommand.java
+++ /dev/null
@@ -1,63 +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
- * -------- -------- -----------------------------------------------------------
- * 20060529 141422 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.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.IWebServiceClient;
-
-public class PreClientRunCommand extends AbstractDataModelOperation
-{
- private IWebServiceClient webServiceClient_;
- private IContext context_;
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IStatus status = Status.OK_STATUS;
-
- if (context_ != null && context_.getRun())
- {
- IEnvironment environment = getEnvironment();
-
- StartServerCommand command = new StartServerCommand();
- command.setServerInstanceId(webServiceClient_.getWebServiceClientInfo().getServerInstanceId());
- command.setEnvironment( environment );
- status = command.execute( monitor, null );
- if (status.getSeverity()==Status.ERROR)
- {
- environment.getStatusHandler().reportError( status );
- }
- }
-
- return status;
- }
-
-
- public void setWebService( IWebServiceClient webServiceClient )
- {
- webServiceClient_ = webServiceClient;
- }
-
- public void setContext(IContext context)
- {
- context_=context;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/helper/WebServiceEvent.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/helper/WebServiceEvent.java
deleted file mode 100644
index 43e5665..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/helper/WebServiceEvent.java
+++ /dev/null
@@ -1,29 +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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.helper;
-
-public class WebServiceEvent {
-
- public static final int REFRESH = 1;
- public static final int REMOVE = 0;
-
- private int eventType = 0;
-
- public WebServiceEvent(int anEventType) {
- super();
- eventType = anEventType;
- }
-
- public int getEventType() {
- return eventType;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/helper/WebServiceManagerListener.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/helper/WebServiceManagerListener.java
deleted file mode 100644
index c44593c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/helper/WebServiceManagerListener.java
+++ /dev/null
@@ -1,16 +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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.helper;
-
-public interface WebServiceManagerListener {
-
- public void webServiceManagerChanged(WebServiceEvent anEvent);
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/helper/WebServicesManager.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/helper/WebServicesManager.java
deleted file mode 100644
index f90468b..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/helper/WebServicesManager.java
+++ /dev/null
@@ -1,1062 +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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.helper;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.client.ApplicationClientResource;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EJBResource;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.webservice.componentcore.util.WSCDDArtifactEdit;
-import org.eclipse.jst.j2ee.internal.webservice.componentcore.util.WSDDArtifactEdit;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebAppResource;
-import org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesResource;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServices;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddResource;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener;
-
-/**
- * Internal API class
- *
- * This utility class is meant to aid in managing webservice(jsr109) metadata related to Java EE 1.4 or earlier
- *
- * Marking as @frozen to support <= Java EE 1.4
- *
- */
-public class WebServicesManager implements EditModelListener, IResourceChangeListener, IResourceDeltaVisitor {
-
- private HashMap wsArtifactEdits = new HashMap();
- private HashMap wsClientArtifactEdits = new HashMap();
- private List wsArtifactEditsList;
- private List wsClientArtifactEditsList;
- private static WebServicesManager INSTANCE = null;
- private List listeners;
- private List removedListeners = new ArrayList();
- private boolean isNotifying = false;
- private boolean wsClientElementsChanged = true;
- private boolean wsElementsChanged = true;
- private ProcessProjectsWithWSDL processNewProjects;
-
- public static final String WSDL_EXT = "wsdl"; //$NON-NLS-1$
- public static final String WSIL_EXT = "wsil"; //$NON-NLS-1$
-
- public synchronized static WebServicesManager getInstance() {
- if (INSTANCE == null)
- INSTANCE = new WebServicesManager();
- return INSTANCE;
- }
-
- public static boolean isFileInteresting(IFile aFile) {
- if (aFile != null && aFile.getFileExtension() != null) {
- String extension = aFile.getFileExtension();
- return extension.equals(WSDL_EXT) || extension.equals(WSIL_EXT)
- || aFile.getName().equals(J2EEConstants.WEB_SERVICES_CLIENT_SHORTNAME)
- || aFile.getName().equals(J2EEConstants.WEB_SERVICES_DD_URI);
- }
- return false;
- }
- /**
- * Default Constructor
- */
- public WebServicesManager() {
- super();
- init();
- }
-
- private void init() {
- collectArtifactEdits();
- ResourcesPlugin.getWorkspace().addResourceChangeListener(this, IResourceChangeEvent.POST_CHANGE);
- }
-
- private void addArtifactEdit(IProject handle) {
- synchronized(wsArtifactEdits) {
- if (!wsArtifactEdits.containsKey(handle)) {
- WSDDArtifactEdit edit = WSDDArtifactEdit.getWSDDArtifactEditForRead(handle);
- if (edit != null) {
- WebServices webServices = edit.getWebServices();
- // If the project has a webservice.xml with internal services or
- // it has .wsil files with external services, we cache the artifact edit
- if ((webServices != null && !webServices.getWebServiceDescriptions().isEmpty()) || !edit.getWSILResources().isEmpty()) {
- edit.addListener(this);
- wsArtifactEdits.put(handle, edit);
- wsElementsChanged = true;
- // Otherwise, dispose the artifact edit
- } else {
- edit.dispose();
- }
- }
- }
- }
- synchronized (wsClientArtifactEdits) {
- if (!wsClientArtifactEdits.containsKey(handle)) {
- WSCDDArtifactEdit edit = WSCDDArtifactEdit.getWSCDDArtifactEditForRead(handle);
- if (edit != null) {
- WebServicesResource res = edit.getWscddXmiResource();
- boolean isInterested = false;
- // Does the project have 1.3 web service clients?
- if (res != null && res.isLoaded() && res.getWebServicesClient() != null)
- isInterested = true;
-
- // Does the project have 1.4 web service clients?
- List wsClientEdits = new ArrayList();
- wsClientEdits.add(edit);
- //if (!getWorkspace14ServiceRefs(wsClientEdits).isEmpty())
- isInterested = true;
-
- // If project has 1.3 or 1.4 web service clients, cache the artifact edit
- if (isInterested) {
- edit.addListener(this);
- wsClientArtifactEdits.put(handle, edit);
- wsClientElementsChanged = true;
- // Otherwise, dispose the artifact edit
- } else {
- edit.dispose();
- }
- }
- }
- }
- }
-
- private void removeArtifactEdit(IProject handle) {
- synchronized(wsArtifactEdits) {
- if (wsArtifactEdits.containsKey(handle)) {
- ArtifactEdit edit = (ArtifactEdit) wsArtifactEdits.get(handle);
- if (edit != null) {
- wsArtifactEdits.remove(handle);
- edit.removeListener(this);
- edit.dispose();
- wsElementsChanged = true;
- }
- }
- }
- synchronized (wsClientArtifactEdits) {
- if (wsClientArtifactEdits.containsKey(handle)) {
- ArtifactEdit edit = (ArtifactEdit) wsClientArtifactEdits.get(handle);
- if (edit != null) {
- wsClientArtifactEdits.remove(handle);
- edit.removeListener(this);
- edit.dispose();
- wsClientElementsChanged = true;
- }
- }
- }
- }
-
- private void collectArtifactEdits() {
- IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
- for (int i = 0; i < projects.length; i++) {
- IProject project = projects[i];
- IVirtualComponent component = ComponentCore.createComponent(project);
- try {
- if (!ModuleCoreNature.isFlexibleProject(project) || JavaEEProjectUtilities.isEARProject(project) || JavaEEProjectUtilities.isStaticWebProject(project))
- continue;
- } catch (Exception e) {
- continue;
- }
- addArtifactEdit(component.getProject());
- }
- }
-
- /**
- * @return Returns the artifact edit iterator for web service artifact edits
- */
- private List getWSArtifactEdits() {
- synchronized (wsArtifactEdits) {
- if (wsElementsChanged) {
- wsArtifactEditsList = new ArrayList();
- wsArtifactEditsList.addAll(wsArtifactEdits.values());
- wsElementsChanged = false;
- }
- }
- return wsArtifactEditsList;
- }
-
- /**
- * @return Returns the editModels.
- */
- private List getWSClientArtifactEdits() {
- synchronized (wsClientArtifactEdits) {
- if (wsClientElementsChanged) {
- wsClientArtifactEditsList = new ArrayList();
- wsClientArtifactEditsList.addAll(wsClientArtifactEdits.values());
- wsClientElementsChanged = false;
- }
- }
- return wsClientArtifactEditsList;
- }
-
- private List getListeners() {
- if (listeners == null)
- listeners = new ArrayList();
- return listeners;
- }
-
- /**
- * Add aListener to the list of listeners.
- */
- public void addListener(WebServiceManagerListener aListener) {
- if (aListener != null && !getListeners().contains(aListener))
- getListeners().add(aListener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener#editModelChanged(org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent)
- */
- public void editModelChanged(EditModelEvent anEvent) {
- if (anEvent == null)
- return;
- if (anEvent.getEventCode()==EditModelEvent.UNLOADED_RESOURCE) {
- List resources = anEvent.getChangedResources();
- for (int i=0; i<resources.size(); i++) {
- Resource res = (Resource) resources.get(i);
- if (isInterestedInResource(res))
- notifyListeners(anEvent.getEventCode());
- }
- }
- else if (anEvent.getEventCode() == EditModelEvent.PRE_DISPOSE) {
- ArtifactEditModel editModel = (ArtifactEditModel) anEvent.getEditModel();
- if (editModel == null || editModel.getProject() == null)
- return;
- removeArtifactEdit(editModel.getProject());
- notifyListeners(anEvent.getEventCode());
- }
- }
-
-
- /**
- * Notify listeners of
- *
- * @anEvent.
- */
- protected void notifyListeners(int anEventType) {
- if (listeners == null)
- return;
- synchronized (this) {
- isNotifying = true;
- }
- try {
- WebServiceEvent webServiceEvent = null;
-
- switch (anEventType) {
- case EditModelEvent.UNLOADED_RESOURCE:
- case EditModelEvent.PRE_DISPOSE:
- case EditModelEvent.REMOVED_RESOURCE:
- webServiceEvent = new WebServiceEvent(WebServiceEvent.REMOVE);
- break;
- default:
- if (!getAllWorkspaceServiceRefs().isEmpty() || !getAllWSDLServices().isEmpty())
- webServiceEvent = new WebServiceEvent(WebServiceEvent.REFRESH);
- }
- List list = getListeners();
- if (webServiceEvent!=null) {
- for (int i = 0; i < list.size(); i++) {
- ((WebServiceManagerListener) list.get(i)).webServiceManagerChanged(webServiceEvent);
- }
- }
- } finally {
- synchronized (this) {
- isNotifying = false;
- if (removedListeners != null && !removedListeners.isEmpty()) {
- for (int i = 0; i < removedListeners.size(); i++)
- listeners.remove(removedListeners.get(i));
- removedListeners.clear();
- }
- }
- }
- }
-
- /**
- * Remove aListener from the list of listeners.
- */
- public synchronized boolean removeListener(WebServiceManagerListener aListener) {
- if (aListener != null) {
- if (isNotifying)
- return removedListeners.add(aListener);
- return getListeners().remove(aListener);
- }
- return false;
- }
-
- private void releaseArtifactEdits() {
- synchronized (wsArtifactEdits) {
- Iterator iter = wsArtifactEdits.values().iterator();
- while (iter.hasNext()) {
- WSDDArtifactEdit artifactEdit = (WSDDArtifactEdit) iter.next();
- artifactEdit.removeListener(this);
- artifactEdit.dispose();
- }
- wsArtifactEdits.clear();
- }
-
- synchronized (wsClientArtifactEdits) {
- Iterator iter = wsClientArtifactEdits.values().iterator();
- while (iter.hasNext()) {
- WSCDDArtifactEdit artifactEdit = (WSCDDArtifactEdit) iter.next();
- artifactEdit.removeListener(this);
- artifactEdit.dispose();
- }
- wsClientArtifactEdits.clear();
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
- */
- public void resourceChanged(IResourceChangeEvent event) {
- acceptDelta(event);
- }
-
-
- protected void acceptDelta(IResourceChangeEvent event) {
- IResourceDelta delta = event.getDelta();
- // search for changes to any projects using a visitor
- if (delta != null) {
- try {
- delta.accept(this);
-
- } catch (Exception e) {
- Logger.getLogger().logError(e);
- }
- }
- }
-
- /**
- * returns a list of internal web services descriptions in the workspace
- */
- public List getInternalWebServicesDescriptions() {
- List result = new ArrayList();
- List webServices = getInternalWebServices();
- for (int i = 0; i < webServices.size(); i++) {
- WebServices webService = (WebServices) webServices.get(i);
- if (webService != null)
- result.addAll(webService.getWebServiceDescriptions());
- }
- return result;
- }
-
- /**
- * @return all internal web services instances in workspace
- */
- public List getInternalWebServices() {
- List result = new ArrayList();
- Iterator iter = getWSArtifactEdits().iterator();
- while (iter.hasNext()) {
- WSDDArtifactEdit artifactEdit = (WSDDArtifactEdit) iter.next();
- WebServices webServices = artifactEdit.getWebServices();
- if (webServices != null)
- result.add(webServices);
- }
- return result;
- }
-
- /**
- * returns a list of all the internal wsdl services in wsdl's pointed to by wsdd's
- */
- public List getInternalWSDLServices() {
- return getWSDLServicesFromWSDLResources(getInternalWSDLResources());
- }
-
- public List getInternalWSDLResources() {
- List result = new ArrayList();
- List wsddWebServices = getInternalWebServicesDescriptions();
- for (int i = 0; i < wsddWebServices.size(); i++) {
- WebServiceDescription webServices = (WebServiceDescription) wsddWebServices.get(i);
- Resource wsdl = getWSDLResource(webServices);
- if (wsdl != null && !result.contains(wsdl))
- result.add(wsdl);
- }
- return result;
- }
-
- public List getExternalWSDLResources() {
- //TODO fix up for basis off .wsil
- List result = getWorkspaceWSDLResources();
- result.removeAll(getInternalWSDLResources());
- List serviceRefs = getAllWorkspaceServiceRefs();
- for (int i=0; i<serviceRefs.size(); i++) {
- ServiceRef ref = (ServiceRef) serviceRefs.get(i);
- try {
- Resource res = WorkbenchResourceHelperBase.getResource(URI.createURI(ref.getWsdlFile()), true);
- if (res !=null && result.contains(res))
- result.remove(res);
- } catch (Exception e) {
- //Ignore
- }
- }
- return result;
- }
-
- public boolean isServiceInternal(EObject service) {
- return getInternalWSDLResources().contains(getWSDLResource(service));
- }
-
- private List getWSDLServicesFromWSDLResources(List wsdlResources) {
- List result = new ArrayList();
- for (int i = 0; i < wsdlResources.size(); i++) {
- Resource wsdl = (Resource) wsdlResources.get(i);
- List services = getWSDLServices(wsdl);
- if (wsdl != null && services != null && !services.isEmpty())
- result.addAll(services);
- }
- return result;
- }
-
- public List getExternalWSDLServices() {
- List result = getWsdlServicesFromWorkspaceWSILs();
- result.removeAll(getInternalWSDLServices());
- return result;
- }
-
- public List getWsdlServicesFromWorkspaceWSILs() {
- List result = new ArrayList();
- List wsilFiles = getWorkspaceWSILFiles();
- for (int i = 0; i < wsilFiles.size(); i++) {
- IFile wsil = (IFile) wsilFiles.get(i);
- List services = getWsdlServicesFromWsilFile(wsil);
- if (!services.isEmpty())
- result.addAll(services);
- }
- return result;
- }
-
- public List getWsdlServicesFromWsilFile(IFile wsil) {
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- return serviceHelper.getWsdlServicesFromWsilFile(wsil);
- }
-
- /**
- * Returns all WSDL Services, both internal and external
- */
- public List getAllWSDLServices() {
- List result = new ArrayList();
- result.addAll(getInternalWSDLServices());
- result.addAll(getExternalWSDLServices());
- return result;
- }
-
- protected void dispose() {
- ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
- releaseArtifactEdits();
- INSTANCE = null;
- }
-
- public Resource getWSDLResource(WebServiceDescription webService) {
- if (webService == null)
- return null;
- String wsdlFileName = webService.getWsdlFile();
- Resource res = null;
- IVirtualResource[] resources = ComponentCore.createResources(WorkbenchResourceHelper.getFile(webService));
- if (resources == null || resources.length==0) return res;
- WSDDArtifactEdit artifactEdit = getExistingWSDDArtifactEdit(resources[0].getComponent().getProject());
- if (artifactEdit!=null)
- res = artifactEdit.getWsdlResource(wsdlFileName);
- return res;
- }
-
- private WSDDArtifactEdit getExistingWSDDArtifactEdit(IProject project) {
- List wsEdits = getWSArtifactEdits();
- for (int i=0; i<wsEdits.size(); i++) {
- WSDDArtifactEdit edit = (WSDDArtifactEdit) wsEdits.get(i);
- if (edit !=null && edit.getProject()!= null && edit.getProject().equals(project))
- return edit;
- }
- return null;
- }
-
- private WSCDDArtifactEdit getExistingWSCDDArtifactEdit(IProject project) {
- List wsClientEdits = getWSClientArtifactEdits();
- for (int i=0; i<wsClientEdits.size(); i++) {
- WSCDDArtifactEdit edit = (WSCDDArtifactEdit) wsClientEdits.get(i);
- if (edit !=null && edit.getProject()!= null && edit.getProject().equals(project))
- return edit;
- }
- return null;
- }
-
- public List getWSDLServices(Resource wsdl) {
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- List result = new ArrayList();
- Object def = serviceHelper.getWSDLDefinition(wsdl);
- if (def == null)
- return result;
- result = new ArrayList(serviceHelper.getDefinitionServices(def).values());
- return result;
- }
-
- public EObject getWSDLServiceForWebService(WebServiceDescription webService) {
- EObject service = null;
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- Resource wsdl = getWSDLResource(webService);
- if (wsdl == null) return service;
- Object definition = serviceHelper.getWSDLDefinition(wsdl);
- if (definition == null) return service;
- Map services = serviceHelper.getDefinitionServices(definition);
- if (services.isEmpty()) return service;
- PortComponent portComp = null;
- if (webService.getPortComponents()!=null && webService.getPortComponents().size()>0) {
- portComp = (PortComponent) webService.getPortComponents().get(0);
- return getService(portComp);
- }
- return service;
- }
-
- public Resource getWSDLResource(EObject wsdlService) {
- return wsdlService.eResource();
- }
-
- public EObject getService(PortComponent port) {
- List services = getInternalWSDLServices();
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- for (int i = 0; i < services.size(); i++) {
- EObject service = (EObject)services.get(i);
- if (serviceHelper.getServicePorts(service).size() == 1) {
- Object wsdlPort = serviceHelper.getServicePorts(service).values().toArray()[0];
- String qName = serviceHelper.getPortBindingNamespaceURI(wsdlPort);
- if (port.getWsdlPort().getNamespaceURI().equals(qName))
- return service;
- }
- }
- return null;
- }
-
- public PortComponent getPortComponent(String qName) {
- List wsDescs = getInternalWebServicesDescriptions();
- for (int i = 0; i < wsDescs.size(); i++) {
- WebServiceDescription wsDesc = (WebServiceDescription) wsDescs.get(i);
- List ports = wsDesc.getPortComponents();
- for (int j = 0; j < ports.size(); j++) {
- PortComponent portComp = (PortComponent) ports.get(j);
- if (portComp.getWsdlPort().getNamespaceURI().equals(qName))
- return portComp;
- }
- }
- return null;
- }
-
- public PortComponent getPortComponent(String qName, IProject project) {
- List wsDescs = getInternalWebServicesDescriptions();
- for (int i = 0; i < wsDescs.size(); i++) {
- WebServiceDescription wsDesc = (WebServiceDescription) wsDescs.get(i);
- List ports = wsDesc.getPortComponents();
- for (int j = 0; j < ports.size(); j++) {
- PortComponent portComp = (PortComponent) ports.get(j);
- if (project == ProjectUtilities.getProject(portComp))
- return portComp;
- }
- }
- return null;
- }
-
- public PortComponent getPortComponent(EObject wsdlService) {
- // If there is only one port in the wsdl service, find the matching port component
- // otherwise if multiple ports return null because we need more information
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- if (wsdlService == null || serviceHelper.getServicePorts(wsdlService).isEmpty())
- return null;
- if (serviceHelper.getServicePorts(wsdlService).size() > 0) {
- Object port = serviceHelper.getServicePorts(wsdlService).values().toArray()[0];
- String qName = serviceHelper.getPortBindingNamespaceURI(port);
- return getPortComponent(qName, ProjectUtilities.getProject(wsdlService));
- }
- return null;
- }
-
- public ServiceImplBean getServiceImplBean(EObject wsdlService) {
- PortComponent port = getPortComponent(wsdlService);
- if (port == null)
- return null;
- return port.getServiceImplBean();
- }
-
- public WsddResource getWsddResource(EObject wsdlService) {
- PortComponent port = getPortComponent(wsdlService);
- if (port == null)
- return null;
- return (WsddResource) port.eResource();
- }
-
- public String getServiceEndpointInterface(EObject wsdlService) {
- PortComponent port = getPortComponent(wsdlService);
- if (port == null)
- return null;
- return port.getServiceEndpointInterface();
- }
-
- public List getAllWorkspaceServiceRefs() {
- List result = new ArrayList();
- result.addAll(getWorkspace13ServiceRefs());
- result.addAll(getWorkspace14ServiceRefs());
- return result;
- }
-
- public List getWorkspace13ServiceRefs() {
- List result = new ArrayList();
- Iterator iter = getWSClientArtifactEdits().iterator();
- while (iter.hasNext()) {
- WSCDDArtifactEdit artifactEdit = (WSCDDArtifactEdit) iter.next();
- WebServicesResource res = artifactEdit.getWscddXmiResource();
- if (res != null && res.isLoaded() && res.getWebServicesClient() != null) {
- if (JavaEEProjectUtilities.isEJBProject(artifactEdit.getProject())) {
- List scopedBeans = res.getWebServicesClient().getComponentScopedRefs();
- for (Iterator iterator = scopedBeans.iterator(); iterator.hasNext();) {
- ComponentScopedRefs refBean = (ComponentScopedRefs) iterator.next();
- result.addAll(refBean.getServiceRefs());
- }
- } else result.addAll(res.getWebServicesClient().getServiceRefs());
- }
- }
- return result;
- }
-
- public List get13ServiceRefs(IProject handle) {
- List result = new ArrayList();
- WSCDDArtifactEdit wsClientArtifactEdit = getExistingWSCDDArtifactEdit(handle);
- if (wsClientArtifactEdit !=null) {
- WebServicesResource res = wsClientArtifactEdit.getWscddXmiResource();
- if (res != null && res.isLoaded() && res.getWebServicesClient() != null)
- result.addAll(res.getWebServicesClient().getServiceRefs());
- }
- return result;
- }
-
- public List getWorkspace14ServiceRefs() {
- return getWorkspace14ServiceRefs(getWSClientArtifactEdits());
- }
-
- private List getWorkspace14ServiceRefs(List wsClientArtifactEdits) {
- Iterator iter = wsClientArtifactEdits.iterator();
- List result = new ArrayList();
- while (iter.hasNext()) {
- WSCDDArtifactEdit wscArtifactEdit = (WSCDDArtifactEdit) iter.next();
-
- IProject project = wscArtifactEdit.getProject();
-
- String projectType = J2EEProjectUtilities.getJ2EEProjectType(project);
- String projectVersion = J2EEProjectUtilities.getJ2EEProjectVersion(project);
- int j2eeLevel = 0;
- if(IModuleConstants.JST_EJB_MODULE.equals(projectType)){
- j2eeLevel = J2EEVersionUtil.convertEJBVersionStringToJ2EEVersionID(projectVersion);
- } else if(IModuleConstants.JST_WEB_MODULE.equals(projectType)){
- j2eeLevel = J2EEVersionUtil.convertWebVersionStringToJ2EEVersionID(projectVersion);
- } else if(IModuleConstants.JST_APPCLIENT_MODULE.equals(projectType)){
- j2eeLevel = J2EEVersionUtil.convertAppClientVersionStringToJ2EEVersionID(projectVersion);
- }
-
- // this method needs to check that project's j2ee level is 14
- if(j2eeLevel != J2EEVersionConstants.J2EE_1_4_ID)
- continue;
-
- ArtifactEdit artifactEdit = ArtifactEdit.getArtifactEditForRead(project);
- try {
- EObject rootObject = null;
- if (artifactEdit!=null)
- rootObject = artifactEdit.getContentModelRoot();
- // handle EJB project case
- if (rootObject instanceof EJBJar) {
- List cmps = ((EJBJar) rootObject).getEnterpriseBeans();
- for (int j = 0; j < cmps.size(); j++) {
- EnterpriseBean bean = (EnterpriseBean) cmps.get(j);
- if (bean.getServiceRefs() != null && !bean.getServiceRefs().isEmpty())
- result.addAll(bean.getServiceRefs());
- }
- }
- // handle Web Project
- else if (rootObject instanceof WebApp) {
- if (((WebApp) rootObject).getServiceRefs() != null && !((WebApp) rootObject).getServiceRefs().isEmpty())
- result.addAll(((WebApp) rootObject).getServiceRefs());
- }
- // handle App clients
- else if (rootObject instanceof ApplicationClient) {
- if (((ApplicationClient) rootObject).getServiceRefs() != null && !((ApplicationClient) rootObject).getServiceRefs().isEmpty())
- result.addAll(((ApplicationClient) rootObject).getServiceRefs());
- }
- } finally {
- if (artifactEdit != null)
- artifactEdit.dispose();
- }
- }
- return result;
- }
-
- public boolean isJ2EE14(ServiceRef ref) {
- return !(ref.eContainer() instanceof WebServicesClient);
- }
-
- public List getWorkspaceWSILFiles() {
- List result = new ArrayList();
- Iterator iter = getWSArtifactEdits().iterator();
- while (iter.hasNext()) {
- WSDDArtifactEdit artifactEdit = (WSDDArtifactEdit) iter.next();
- List files = artifactEdit.getWSILResources();
- for (int j = 0; j < files.size(); j++) {
- IFile file = (IFile) files.get(j);
- if (file != null && WSIL_EXT.equals(file.getFileExtension()))
- result.add(file);
- }
- }
- return result;
- }
-
- public List getWorkspaceWSDLResources() {
- List result = new ArrayList();
- Iterator iter = getWSArtifactEdits().iterator();
- while (iter.hasNext()) {
- WSDDArtifactEdit artifactEdit = (WSDDArtifactEdit) iter.next();
- IProject project = artifactEdit.getProject();
- if (project != null) {
- List wsdlResources = artifactEdit.getWSDLResources();
- if (wsdlResources != null && !wsdlResources.isEmpty()) {
- for (int j = 0; j < wsdlResources.size(); j++) {
- Resource wsdl = (Resource) wsdlResources.get(j);
- if (!result.contains(wsdl))
- result.add(wsdl);
- }
- }
- }
- }
- return result;
- }
-
- public List getWSDLServices() {
- List result = new ArrayList();
- List internalWsdls = getInternalWSDLServices();
- if (internalWsdls != null && !internalWsdls.isEmpty())
- result.addAll(internalWsdls);
- //TODO add externals
- return result;
- }
-
- /**
- * @param bean
- * @return
- */
- public List get13ServiceRefs(EnterpriseBean bean) {
- WSCDDArtifactEdit artifactEdit = null;
- IFile file = WorkbenchResourceHelper.getFile(bean);
- if (file!=null)
- artifactEdit = getExistingWSCDDArtifactEdit(file.getProject());
- if (artifactEdit !=null) {
- WebServicesResource res = artifactEdit.getWscddXmiResource();
- if (res != null && res.getWebServicesClient() != null) {
- String ejbName = bean.getName();
- List scopes = res.getWebServicesClient().getComponentScopedRefs();
- for (Iterator iter = scopes.iterator(); iter.hasNext();) {
- ComponentScopedRefs scope = (ComponentScopedRefs) iter.next();
- if (scope.getComponentName().equals(ejbName))
- return scope.getServiceRefs();
- }
- }
- }
- return Collections.EMPTY_LIST;
- }
-
- /**
- * @param client
- * @return
- */
- public List get13ServiceRefs(ApplicationClient client) {
- IProject handle = getComponentProject(WorkbenchResourceHelper.getFile(client));
- if (handle == null)
- return Collections.EMPTY_LIST;
- WSCDDArtifactEdit artifactEdit = getExistingWSCDDArtifactEdit(handle);
- if (artifactEdit !=null) {
- WebServicesResource res = artifactEdit.getWscddXmiResource();
- if (res != null) {
- WebServicesClient webClient = res.getWebServicesClient();
- if (webClient != null)
- return webClient.getServiceRefs();
- }
- }
- return Collections.EMPTY_LIST;
- }
-
- /**
- * @param webapp
- * @return
- */
- public List get13ServiceRefs(WebApp webapp) {
- IProject handle = getComponentProject(WorkbenchResourceHelper.getFile(webapp));
- if (handle == null)
- return Collections.EMPTY_LIST;
- WSCDDArtifactEdit artifactEdit = getExistingWSCDDArtifactEdit(handle);
- if (artifactEdit !=null) {
- WebServicesResource res = artifactEdit.getWscddXmiResource();
- if (res != null) {
- WebServicesClient webClient = res.getWebServicesClient();
- if (webClient != null)
- return webClient.getServiceRefs();
- }
- }
- return Collections.EMPTY_LIST;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.resources.IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta)
- */
- public boolean visit(IResourceDelta delta) throws CoreException {
- IResource resource = delta.getResource();
- if (resource.getType() == IResource.PROJECT) {
- IProject p = (IProject) resource;
- // Handle project adds and project opens
- if ((delta.getKind()==IResourceDelta.ADDED || (((delta.getFlags() & IResourceDelta.OPEN) != 0) && p.isAccessible()))) {
- IVirtualComponent component = ComponentCore.createComponent(p);
- if (component!=null && !JavaEEProjectUtilities.isEARProject(p) && !JavaEEProjectUtilities.isStaticWebProject(p)) {
- getQueuedJob().addProject(p);
- return false;
- }
- }
- // Handle project close events and removals
- else if ((delta.getKind() == IResourceDelta.CHANGED && ((delta.getFlags() & IResourceDelta.OPEN) != 0))
- || (delta.getKind() == IResourceDelta.REMOVED)){
- removeArtifactEdit(p);
- return false;
- }
- }
-
- else if (resource.getType() == IResource.FILE && isInterrestedInFile((IFile) resource)) {
- // Handle WSIL and WSDL File additions as well as webservice.xml and webserviceclient.xml
- if ((delta.getKind() == IResourceDelta.ADDED) || ((delta.getFlags() & IResourceDelta.MOVED_TO) != 0)) {
- if (resource.getFileExtension().equals(WSDL_EXT))
- addedWsdl((IFile) resource);
- else if (resource.getFileExtension().equals(WSIL_EXT))
- addedWsil((IFile)resource);
- else if (resource.getName().equals(J2EEConstants.WEB_SERVICES_CLIENT_SHORTNAME) ||
- resource.getName().equals(J2EEConstants.WEB_SERVICES_DD_URI)) {
- getQueuedJob().addProject(resource.getProject());
- }
- }
- // Handle WSIL or WSDL file removals
- else if ((delta.getKind() == IResourceDelta.REMOVED) || ((delta.getFlags() & IResourceDelta.MOVED_FROM) != 0)) {
- if (resource.getFileExtension().equals(WSDL_EXT) || resource.getFileExtension().equals(WSIL_EXT))
- notifyListeners(EditModelEvent.UNLOADED_RESOURCE);
- }
- return false;
- }
- return true;
- }
-
- private ProcessProjectsWithWSDL createProjectsJob() {
- Set newSet = new HashSet();
- ProcessProjectsWithWSDL job = new ProcessProjectsWithWSDL(newSet, EditModelEvent.ADDED_RESOURCE);
- job.setRule(ResourcesPlugin.getWorkspace().getRoot());
- job.setSystem(true);
- return job;
- }
-
- private ProcessProjectsWithWSDL getQueuedJob() {
-
- if (processNewProjects != null && (processNewProjects.getState() == Job.WAITING)){
- return processNewProjects;
- }
- processNewProjects = createProjectsJob();
- processNewProjects.schedule();
- return processNewProjects;
- }
-
- private class ProcessProjectsWithWSDL extends Job
- {
- private Set currentProjects;
- private int eventType;
-
- public ProcessProjectsWithWSDL(Set p, int newEventType)
- {
- super(ConsumptionUIMessages.MSG_LOADING_WEB_SERVICE);
- currentProjects = p;
- eventType = newEventType;
- }
-
- public void addProject(IProject p) {
- synchronized(currentProjects) {
- currentProjects.add(p);
- }
- }
-
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- // Null out job for processing new projects
- synchronized (processNewProjects) {
- if(processNewProjects == this){
- processNewProjects = null;
- }
- }
- for (Iterator iterator = currentProjects.iterator(); iterator.hasNext();) {
- IProject currentProject = (IProject) iterator.next();
- addArtifactEdit(currentProject);
- }
- notifyListeners(eventType);
-
- return Status.OK_STATUS;
- }
- }
-
- protected void addedWsdl(IFile wsdl) {
- if (!wsdl.exists())
- return;
- IProject handle = getComponentProject(wsdl);
- if (handle != null) {
- addArtifactEdit(handle);
- notifyListeners(EditModelEvent.LOADED_RESOURCE);
- }
- }
-
- protected void addedWsil(IFile wsil) {
- if (!wsil.exists())
- return;
- IProject handle = getComponentProject(wsil);
- if (handle != null) {
- addArtifactEdit(handle);
- notifyListeners(EditModelEvent.LOADED_RESOURCE);
- }
- }
-
- private IProject getComponentProject(IFile res) {
- if (res==null)
- return null;
- return res.getProject();
- }
-
- protected boolean isInterrestedInFile(IFile aFile) {
- return isFileInteresting(aFile);
- }
-
- /**
- * The only resources webservice manager is concerned about are:
- * webservice.xml, webserviceclient.xml, and J2EE 1.4 web.xml, ejb-jar-xml, and application-client.xml
- * @param res
- * @return boolean isInterested
- */
- private boolean isInterestedInResource(Resource res) {
- if (res instanceof WsddResource || res instanceof WebServicesResource) {
- return true;
- } else if (res instanceof EJBResource || res instanceof WebAppResource || res instanceof ApplicationClientResource) {
- return ((XMLResource)res).getJ2EEVersionID()>J2EEVersionConstants.J2EE_1_3_ID;
- } else {
- return false;
- }
- }
-
- /**
- * @param object
- * @return
- */
- public Collection getServiceRefs(EJBJar jar) {
-
- List list = new ArrayList();
- List beans = jar.getEnterpriseBeans();
- try {
- for (int i = 0; i < beans.size(); i++) {
- EnterpriseBean bean = (EnterpriseBean) beans.get(i);
- list.addAll(getServiceRefs(bean));
- }
- } catch (Exception e) {
- //Ignore
- }
- return list;
- }
-
- public Collection getServiceRefs(EnterpriseBean bean) {
- List list = new ArrayList();
- if (bean.getEjbJar().getJ2EEVersionID() >= J2EEVersionConstants.J2EE_1_4_ID)
- list.addAll(bean.getServiceRefs());
- else
- list.addAll(get13ServiceRefs(bean));
- return list;
- }
-
- public Collection getServiceRefs(WebApp webapp) {
-
- List list = new ArrayList();
- try {
- if (webapp.getVersionID() >= J2EEVersionConstants.WEB_2_4_ID)
- list.addAll(webapp.getServiceRefs());
- else
- list.addAll(get13ServiceRefs(webapp));
- } catch (Exception e) {
- //Ignore
- }
- return list;
- }
-
- public Collection getServiceRefs(ApplicationClient client) {
-
- List list = new ArrayList();
- try {
- if (client.getJ2EEVersionID() >= J2EEVersionConstants.J2EE_1_4_ID)
- list.addAll(client.getServiceRefs());
- else
- list.addAll(get13ServiceRefs(client));
- } catch (Exception e) {
- //Ignore
- }
- return list;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/plugin/WebServiceConsumptionUIPlugin.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/plugin/WebServiceConsumptionUIPlugin.java
deleted file mode 100644
index f599367..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/plugin/WebServiceConsumptionUIPlugin.java
+++ /dev/null
@@ -1,108 +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 115690 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060504 136118 joan@ca.ibm.com - Joan Haggarty
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.plugin;
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.ws.internal.consumption.ui.preferences.PersistentProjectTopologyContext;
-import org.eclipse.jst.ws.internal.consumption.ui.preferences.PersistentServerRuntimeContext;
-import org.eclipse.jst.ws.internal.consumption.ui.preferences.ProjectTopologyContext;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-
-/**
-* 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 WebServiceConsumptionUIPlugin extends AbstractUIPlugin
-{
-
- /**
- * The identifier of the descriptor of this plugin in plugin.xml.
- */
- public static final String ID = "org.eclipse.jst.ws.consumption.ui";
-
- /**
- * The reference to the singleton instance of this plugin.
- */
- private static WebServiceConsumptionUIPlugin instance_;
-
- private PersistentServerRuntimeContext serverRuntimeContext_;
- private PersistentProjectTopologyContext projectTopologyContext_;
-
- /**
- * Constructs a runtime plugin object for this plugin.
- */
- public WebServiceConsumptionUIPlugin ()
- {
- super();
- instance_ = this;
- }
-
- /**
- * Returns the singleton instance of this plugin. Equivalent to calling
- * (WebServiceConsumptionUIPlugin)Platform.getPlugin("org.eclipse.jst.ws.ui");
- * @return The WebServiceConsumptionUIPlugin singleton.
- */
- static public WebServiceConsumptionUIPlugin 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;
- }
- }
-
- public ProjectTopologyContext getProjectTopologyContext()
- {
- if (projectTopologyContext_ == null)
- {
- projectTopologyContext_ = new PersistentProjectTopologyContext();
- projectTopologyContext_.load();
- }
-
- return projectTopologyContext_;
- }
-
- public PersistentServerRuntimeContext getServerRuntimeContext()
- {
- if (serverRuntimeContext_ == null)
- {
- serverRuntimeContext_ = new PersistentServerRuntimeContext();
- serverRuntimeContext_.load();
- }
- return serverRuntimeContext_;
- }
- }
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/PersistentProjectTopologyContext.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/PersistentProjectTopologyContext.java
deleted file mode 100644
index 5662e98..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/PersistentProjectTopologyContext.java
+++ /dev/null
@@ -1,137 +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
- * -------- -------- -----------------------------------------------------------
- * 20060202 119780 pmoogk@ca.ibm.com - Peter Moogk
- * 20060216 127138 pmoogk@ca.ibm.com - Peter Moogk
- * 20060227 124392 rsinha@ca.ibm.com - Rupam Kuehner
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.preferences;
-
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.wst.command.internal.env.context.PersistentContext;
-import com.ibm.icu.util.StringTokenizer;
-
-
-public class PersistentProjectTopologyContext extends PersistentContext implements ProjectTopologyContext
-{
-
- public PersistentProjectTopologyContext ()
- {
- super( WebServiceConsumptionUIPlugin.getInstance());
- }
-
- public void load()
- {
- //Load the service project types
- String[] serviceIds = ProjectTopologyDefaults.getServiceTypes();
- StringBuffer serviceSb = new StringBuffer();
- for (int i = 0; i < serviceIds.length; i++)
- {
- if (i != 0)
- serviceSb.append(" ");
- serviceSb.append(serviceIds[i]);
- }
- setDefaultStringIfNoDefault(PREFERENCE_SERVICE_TYPES, serviceSb.toString());
-
- //Load the client project types
- String[] ids = ProjectTopologyDefaults.getClientTypes();
- StringBuffer sb = new StringBuffer();
- for (int i = 0; i < ids.length; i++)
- {
- if (i != 0)
- sb.append(" ");
- sb.append(ids[i]);
- }
- setDefaultStringIfNoDefault(PREFERENCE_CLIENT_TYPES, sb.toString());
- setDefault(PREFERENCE_USE_TWO_EARS, ProjectTopologyDefaults.isUseTwoEARs());
- }
-
- public void setServiceTypes(String[] ids)
- {
- StringBuffer sb = new StringBuffer();
- for (int i = 0; i < ids.length; i++)
- {
- if (i != 0)
- sb.append(" ");
- sb.append(ids[i]);
- }
- setValue(PREFERENCE_SERVICE_TYPES, sb.toString());
- }
-
- public String[] getServiceTypes()
- {
- StringTokenizer st = new StringTokenizer(getValueAsString(PREFERENCE_SERVICE_TYPES));
- String[] s = new String[st.countTokens()];
- for (int i = 0; i < s.length; i++)
- s[i] = st.nextToken();
- return s;
- }
-
- public String[] getDefaultServiceTypes()
- {
- StringTokenizer st = new StringTokenizer(getDefaultString(PREFERENCE_SERVICE_TYPES));
- String[] s = new String[st.countTokens()];
- for (int i = 0; i < s.length; i++)
- s[i] = st.nextToken();
- return s;
- }
-
- public void setClientTypes(String[] ids)
- {
- StringBuffer sb = new StringBuffer();
- for (int i = 0; i < ids.length; i++)
- {
- if (i != 0)
- sb.append(" ");
- sb.append(ids[i]);
- }
- setValue(PREFERENCE_CLIENT_TYPES, sb.toString());
- }
-
- public String[] getClientTypes()
- {
- StringTokenizer st = new StringTokenizer(getValueAsString(PREFERENCE_CLIENT_TYPES));
- String[] s = new String[st.countTokens()];
- for (int i = 0; i < s.length; i++)
- s[i] = st.nextToken();
- return s;
- }
-
- public String[] getDefaultClientTypes()
- {
- StringTokenizer st = new StringTokenizer(getDefaultString(PREFERENCE_CLIENT_TYPES));
- String[] s = new String[st.countTokens()];
- for (int i = 0; i < s.length; i++)
- s[i] = st.nextToken();
- return s;
- }
-
- public void setUseTwoEARs(boolean use)
- {
- setValue(PREFERENCE_USE_TWO_EARS, use);
- }
- public boolean isUseTwoEARs()
- {
- return getValueAsBoolean(PREFERENCE_USE_TWO_EARS);
- }
-
- public ProjectTopologyContext copy() {
- TransientProjectTopologyContext context = new TransientProjectTopologyContext();
- context.setServiceTypes(getServiceTypes());
- context.setDefaultServiceTypes(getDefaultServiceTypes());
- context.setClientTypes(getClientTypes());
- context.setDefaultClientTypes(getDefaultClientTypes());
- context.setUseTwoEARs(isUseTwoEARs());
- return context;
-}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/PersistentServerRuntimeContext.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/PersistentServerRuntimeContext.java
deleted file mode 100644
index 5a76e39..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/PersistentServerRuntimeContext.java
+++ /dev/null
@@ -1,120 +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
- * -------- -------- -----------------------------------------------------------
- * 20080415 227152 makandre@ca.ibm.com - Andrew Mak, Need a way to specify a backup Web service runtime
- * 20080918 247537 mahutch@ca.ibm.com - Mark Hutchinson, Update default server runtime to Tomcat 6
- * 20090803 283399 ericdp@ca.ibm.com - Eric D. Peters, Web Services > Server & Runtime preference undefined
- * 20091007 283399 ericdp@ca.ibm.com - Eric D. Peters, Web Services > Server & Runtime preference undefined
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.preferences;
-
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.wst.command.internal.env.context.PersistentContext;
-
-
-/**
- *
- */
-public class PersistentServerRuntimeContext extends PersistentContext {
-
- private String PREFERENCE_SERVER = "PREFERENCE_SERVER";
- private String PREFERENCE_RUNTIME = "PREFERENCE_RUNTIME";
- private String FALLBACK_RUNTIME = "FALLBACK_RUNTIME"; // Web service runtime to fallback to if preferred runtime is not suitable
- //private String PREFERENCE_J2EE_VERSION = "PREFERENCE_J2EE_VERSION";
-
- private String SERVER_FACTORY_ID_DEFAULT = "org.eclipse.jst.server.tomcat.60";
- private String RUNTIME_ID_DEFAULT = "org.eclipse.jst.ws.axis.creation.axisWebServiceRT";
-
- public PersistentServerRuntimeContext()
- {
- super(WebServiceConsumptionUIPlugin.getInstance());
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.Context#load()
- */
- public void load() {
- //Defaults will be set via the .ini customization. They are hard coded to default values in the
- //absence of a .ini file.
- String serverDefault = getDefaultString(PREFERENCE_SERVER);
- if (serverDefault==null || serverDefault.length()==0 || WebServiceRuntimeExtensionUtils2.getServerLabelById(serverDefault)==null)
- {
- setDefault(PREFERENCE_SERVER, SERVER_FACTORY_ID_DEFAULT);
- }
-
- String runtimeDefault = getDefaultString(PREFERENCE_RUNTIME);
- if (WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(runtimeDefault)==null)
- //try again using fall back runtime
- runtimeDefault = getDefaultString(FALLBACK_RUNTIME);
- if (runtimeDefault==null || runtimeDefault.length()==0 || WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(runtimeDefault)==null)
- {
- setDefault(PREFERENCE_RUNTIME, RUNTIME_ID_DEFAULT);
- } else {
- setDefault(PREFERENCE_RUNTIME, runtimeDefault);
- }
-
-
- }
-
- public String getDefaultServerFactoryId()
- {
- return getDefaultString(PREFERENCE_SERVER);
- }
-
- public String getDefaultRuntimeId()
- {
- return getDefaultString(PREFERENCE_RUNTIME);
- }
-
- public String getFallbackRuntimeId()
- {
- return getDefaultString(FALLBACK_RUNTIME);
- }
-
- public String getServerFactoryId()
- {
- String value = getValueAsString(PREFERENCE_SERVER);
- /*
- if (value==null || value.length()==0)
- {
- value = SERVER_FACTORY_ID_DEFAULT;
- setServerFactoryId(value);
- }
- */
- return value;
- }
-
- public String getRuntimeId()
- {
- String value = getValueAsString(PREFERENCE_RUNTIME);
- /*
- if (value==null || value.length()==0)
- {
- value = RUNTIME_ID_DEFAULT;
- setRuntimeId(value);
- }
- */
- return value;
- }
-
-
- public void setServerFactoryId(String id)
- {
- setValue(PREFERENCE_SERVER,id);
- }
-
- public void setRuntimeId(String id)
- {
- setValue(PREFERENCE_RUNTIME, id);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ProjectTopologyContext.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ProjectTopologyContext.java
deleted file mode 100644
index cc21c4b..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ProjectTopologyContext.java
+++ /dev/null
@@ -1,42 +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
- * -------- -------- -----------------------------------------------------------
- * 20060227 124392 rsinha@ca.ibm.com - Rupam Kuehner
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.preferences;
-
-public interface ProjectTopologyContext
-{
- /**
- * This constant String is used to lookup the preferred order of the different client types
- **/
- public static final String PREFERENCE_CLIENT_TYPES = "clientTypes";
- public static final String PREFERENCE_SERVICE_TYPES = "serviceTypes";
-
- /**
- * This constant String is used to lookup the two EAR option
- **/
- public static final String PREFERENCE_USE_TWO_EARS = "useTwoEARs";
-
- public void setServiceTypes(String[] ids);
- public String[] getServiceTypes();
- public String[] getDefaultServiceTypes();
-
- public void setClientTypes(String[] ids);
- public String[] getClientTypes();
- public String[] getDefaultClientTypes();
-
- public void setUseTwoEARs(boolean use);
- public boolean isUseTwoEARs();
-
- public ProjectTopologyContext copy();
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ProjectTopologyDefaults.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ProjectTopologyDefaults.java
deleted file mode 100644
index e19e1f5..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ProjectTopologyDefaults.java
+++ /dev/null
@@ -1,36 +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
- * -------- -------- -----------------------------------------------------------
- * 20060227 124392 rsinha@ca.ibm.com - Rupam Kuehner
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.preferences;
-
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-
-public class ProjectTopologyDefaults
-{
-
- public static final String[] getServiceTypes()
- {
- return WebServiceRuntimeExtensionUtils2.getAllServiceProjectTypes();
- }
-
- public static final String[] getClientTypes()
- {
- return WebServiceRuntimeExtensionUtils2.getAllClientProjectTypes();
- }
-
- public static final boolean isUseTwoEARs()
- {
- return true;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ProjectTopologyPreferencePage.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ProjectTopologyPreferencePage.java
deleted file mode 100644
index 2165b2b..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ProjectTopologyPreferencePage.java
+++ /dev/null
@@ -1,454 +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
- * -------- -------- -----------------------------------------------------------
- * 20060227 124392 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060515 141398 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.preferences;
-
-import java.util.Vector;
-
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.ui.WSUIPluginMessages;
-import org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-
-
-public class ProjectTopologyPreferencePage extends PreferencePage implements IWorkbenchPreferencePage, SelectionListener
-{
- /*CONTEXT_ID PTPP0001 for the Project Topology Preference Page*/
- private String INFOPOP_PTPP_PAGE = WebServiceUIPlugin.ID + ".PTPP0001";
-
- private TableViewer serviceTypeViewer_;
- private Button serviceMoveUp_;
- private Button serviceMoveDown_;
- private Vector serviceTypes_;
-
- private TableViewer clientTypeViewer_;
- private Button moveUp_;
- private Button moveDown_;
- private Vector clientTypes_;
-
- private Button twoEAR_;
-
- /**
- * Creates preference page controls on demand.
- * @param parent the parent for the preference page
- */
- protected Control createContents(Composite superparent)
- {
- Composite parent = new Composite( superparent, SWT.NONE );
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- parent.setLayout( layout );
- parent.setToolTipText(WSUIPluginMessages.TOOLTIP_PTPP_PAGE);
- parent.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
- PlatformUI.getWorkbench().getHelpSystem().setHelp(parent,INFOPOP_PTPP_PAGE);
-
- Group serviceTypeComposite = new Group( parent, SWT.NONE );
- GridLayout servicegl = new GridLayout();
- servicegl.numColumns = 2;
- //servicegl.marginHeight = 0;
- //servicegl.marginWidth = 0;
- serviceTypeComposite.setLayout(servicegl);
- serviceTypeComposite.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ));
- serviceTypeComposite.setText(WSUIPluginMessages.LABEL_SERVICE_TYPE_NAME);
-
- Table serviceTable= new Table(serviceTypeComposite, SWT.BORDER | SWT.SINGLE | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL);
- GridData servicegd = new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL);
- servicegd.widthHint = 256;
- serviceTable.setLayoutData(servicegd);
- serviceTable.setToolTipText(WSUIPluginMessages.TOOLTIP_SERVICE_TYPE_TABLE_VIEWER);
-
- serviceTypes_ = new Vector();
- serviceTypeViewer_ = new TableViewer(serviceTable);
- serviceTypeViewer_.setContentProvider(new ClientTypeContentProvider());
- serviceTypeViewer_.setLabelProvider(new ClientTypeLabelProvider());
- serviceTypeViewer_.setInput(serviceTypes_);
-
- TableLayout serviceTableLayout = new TableLayout();
- TableColumn serviceTableColumn = new TableColumn(serviceTable, SWT.NONE);
- serviceTableColumn.setText(WSUIPluginMessages.LABEL_SERVICE_TYPE_NAME);
- ColumnWeightData serviceColumnData = new ColumnWeightData(256, 256, false);
- serviceTableLayout.addColumnData(serviceColumnData);
- serviceTable.setLayout(serviceTableLayout);
-
- Composite servicec = new Composite(serviceTypeComposite, SWT.NONE);
- servicegl = new GridLayout();
- servicegl.numColumns = 1;
- //servicegl.marginHeight = 10;
- servicegl.marginWidth = 0;
- servicec.setLayout(servicegl);
- servicec.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-
- serviceMoveUp_ = new Button(servicec, SWT.PUSH);
- serviceMoveUp_.setText(WSUIPluginMessages.LABEL_MOVE_UP);
- serviceMoveUp_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- serviceMoveUp_.addSelectionListener(this);
- serviceMoveUp_.setToolTipText(WSUIPluginMessages.TOOLTIP_MOVE_UP);
-
- serviceMoveDown_ = new Button(servicec, SWT.PUSH);
- serviceMoveDown_.setText(WSUIPluginMessages.LABEL_MOVE_DOWN);
- serviceMoveDown_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- serviceMoveDown_.addSelectionListener(this);
- serviceMoveDown_.setToolTipText(WSUIPluginMessages.TOOLTIP_MOVE_DOWN);
-
- serviceTable.addSelectionListener(new TableSelectionListener(serviceMoveUp_, serviceMoveDown_, serviceTable));
-
- Group clientTypeComposite = new Group( parent, SWT.NONE );
- GridLayout gl = new GridLayout();
- gl.numColumns = 2;
- //gl.marginHeight = 0;
- //gl.marginWidth = 0;
- clientTypeComposite.setLayout(gl);
- clientTypeComposite.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ));
- clientTypeComposite.setText(WSUIPluginMessages.LABEL_CLIENT_TYPE_NAME);
-
- Table clientTable= new Table(clientTypeComposite, SWT.BORDER | SWT.SINGLE | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL);
- gd.widthHint = 256;
- clientTable.setLayoutData(gd);
- clientTable.setToolTipText(WSUIPluginMessages.TOOLTIP_CLIENT_TYPE_TABLE_VIEWER);
-
- clientTypes_ = new Vector();
- clientTypeViewer_ = new TableViewer(clientTable);
- clientTypeViewer_.setContentProvider(new ClientTypeContentProvider());
- clientTypeViewer_.setLabelProvider(new ClientTypeLabelProvider());
- clientTypeViewer_.setInput(clientTypes_);
-
- TableLayout tableLayout = new TableLayout();
- TableColumn tableColumn = new TableColumn(clientTable, SWT.NONE);
- tableColumn.setText(WSUIPluginMessages.LABEL_CLIENT_TYPE_NAME);
- ColumnWeightData columnData = new ColumnWeightData(256, 256, false);
- tableLayout.addColumnData(columnData);
- clientTable.setLayout(tableLayout);
-
- Composite c = new Composite(clientTypeComposite, SWT.NONE);
- gl = new GridLayout();
- gl.numColumns = 1;
- //gl.marginHeight = 10;
- gl.marginWidth = 0;
- c.setLayout(gl);
- c.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-
- moveUp_ = new Button(c, SWT.PUSH);
- moveUp_.setText(WSUIPluginMessages.LABEL_MOVE_UP_2);
- moveUp_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- moveUp_.addSelectionListener(this);
- moveUp_.setToolTipText(WSUIPluginMessages.TOOLTIP_MOVE_UP);
-
- moveDown_ = new Button(c, SWT.PUSH);
- moveDown_.setText(WSUIPluginMessages.LABEL_MOVE_DOWN_2);
- moveDown_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- moveDown_.addSelectionListener(this);
- moveDown_.setToolTipText(WSUIPluginMessages.TOOLTIP_MOVE_DOWN);
-
- clientTable.addSelectionListener(new TableSelectionListener(moveUp_, moveDown_, clientTable));
-
- twoEAR_ = new Button(parent, SWT.CHECK | SWT.WRAP );
- twoEAR_.setText(WSUIPluginMessages.LABEL_ENABLE_TWO_EARS);
- twoEAR_.setToolTipText(WSUIPluginMessages.TOOLTIP_ENABLE_TWO_EARS);
-
- initializeValues();
- org.eclipse.jface.dialogs.Dialog.applyDialogFont(superparent);
-
- return parent;
- }
-
- /**
- * 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()
- {
- storeValues();
- return true;
- }
-
- protected void performApply()
- {
- performOk();
- }
-
- /**
- * @see IWorkbenchPreferencePage
- */
- public void init(IWorkbench workbench) { }
-
-
- /**
- * Adds the String elements of array a into Vector v. If String array b contains any elements
- * that are not already in array a, appends these elements from array b to the end of Vector v.
- * @param a a String array
- * @param b a String array
- * @param v a non-null Vector
- */
- private void setVectorContentsFromTwoArrays(String[] a, String[] b, Vector v)
- {
- for (int i = 0; i < a.length; i++)
- {
- v.add(a[i]);
- }
-
- for (int i = 0; i < b.length; i++)
- {
- if (v.indexOf(b[i]) == -1)
- {
- v.add(b[i]);
- }
- }
- }
-
- /**
- * Initializes states of the controls to their burned-in defaults.
- */
- private void initializeDefaults()
- {
- ProjectTopologyContext context = WebServiceConsumptionUIPlugin.getInstance().getProjectTopologyContext();
- serviceTypes_.clear();
- String[] defaultServiceTypes = context.getDefaultServiceTypes();
- String[] allServiceTypes = ProjectTopologyDefaults.getServiceTypes();
- setVectorContentsFromTwoArrays(defaultServiceTypes, allServiceTypes, serviceTypes_);
- serviceTypeViewer_.refresh();
-
- clientTypes_.clear();
- String[] defaultClientTypes = context.getDefaultClientTypes();
- String[] allClientTypes = ProjectTopologyDefaults.getClientTypes();
- setVectorContentsFromTwoArrays(defaultClientTypes, allClientTypes, clientTypes_);
- clientTypeViewer_.refresh();
-
- twoEAR_.setSelection(true);
- }
-
- /**
- * Initializes states of the controls from the preference helper.
- */
- private void initializeValues()
- {
- //Initial service project types.
- ProjectTopologyContext context = WebServiceConsumptionUIPlugin.getInstance().getProjectTopologyContext();
- String[] serviceTypesFromContext = context.getServiceTypes();
- String[] allServiceTypes = ProjectTopologyDefaults.getServiceTypes();
- setVectorContentsFromTwoArrays(serviceTypesFromContext, allServiceTypes, serviceTypes_);
- if (allServiceTypes.length > serviceTypesFromContext.length)
- {
- String[] serviceTypesArray = new String[serviceTypes_.size()];
- serviceTypes_.copyInto(serviceTypesArray);
- context.setServiceTypes(serviceTypesArray);
- }
- // refresh viewer
- serviceTypeViewer_.refresh();
-
- // select the first item in this table
- if (serviceTypeViewer_.getTable().getItemCount() > 0){
- serviceTypeViewer_.getTable().setSelection(0);
- serviceTypeViewer_.getTable().notifyListeners(SWT.Selection, new Event());
- }
-
- //Initialize client project types.
- String[] clientTypesFromContext = context.getClientTypes();
- String[] allClientTypes = ProjectTopologyDefaults.getClientTypes();
- setVectorContentsFromTwoArrays(clientTypesFromContext, allClientTypes, clientTypes_);
- if (allClientTypes.length > clientTypesFromContext.length)
- {
- String[] clientTypesArray = new String[clientTypes_.size()];
- clientTypes_.copyInto(clientTypesArray);
- context.setClientTypes(clientTypesArray);
- }
-
- // refresh viewer
- clientTypeViewer_.refresh();
-
- // select the first item in this table
- Table table = clientTypeViewer_.getTable();
- if (table.getItemCount() > 0){
- table.setSelection(0);
- table.notifyListeners(SWT.Selection, new Event());
- }
-
- twoEAR_.setSelection(context.isUseTwoEARs());
- }
-
- /**
- * Stores the values of the controls back to the preference helper.
- */
- private void storeValues()
- {
- ProjectTopologyContext context = WebServiceConsumptionUIPlugin.getInstance().getProjectTopologyContext();
- String[] serviceTypesArray = new String[serviceTypes_.size()];
- serviceTypes_.copyInto(serviceTypesArray);
- context.setServiceTypes(serviceTypesArray);
- String[] types = new String[clientTypes_.size()];
- clientTypes_.copyInto(types);
- context.setClientTypes(types);
- context.setUseTwoEARs(twoEAR_.getSelection());
- }
-
- public void widgetDefaultSelected(SelectionEvent e)
- {
- }
-
- public void widgetSelected(SelectionEvent e)
- {
- if (e.widget == serviceMoveUp_ || e.widget == serviceMoveDown_)
- {
- int index = serviceTypeViewer_.getTable().getSelectionIndex();
- if (index != -1)
- {
- if (e.widget == serviceMoveUp_ && index > 0)
- {
- Object object = serviceTypes_.remove(index);
- serviceTypes_.insertElementAt(object, index-1);
- serviceTypeViewer_.refresh();
- }
- else if (e.widget == serviceMoveDown_ && index < serviceTypes_.size()-1)
- {
- Object object = serviceTypes_.remove(index);
- serviceTypes_.insertElementAt(object, index+1);
- serviceTypeViewer_.refresh();
- }
- serviceTypeViewer_.getTable().notifyListeners(SWT.Selection, new Event());
- }
- }
- else if (e.widget == moveUp_ || e.widget == moveDown_)
- {
- int index = clientTypeViewer_.getTable().getSelectionIndex();
- if (index != -1)
- {
- if (e.widget == moveUp_ && index > 0)
- {
- Object object = clientTypes_.remove(index);
- clientTypes_.insertElementAt(object, index - 1);
- clientTypeViewer_.refresh();
- } else if (e.widget == moveDown_ && index < clientTypes_.size() - 1)
- {
- Object object = clientTypes_.remove(index);
- clientTypes_.insertElementAt(object, index + 1);
- clientTypeViewer_.refresh();
- }
- clientTypeViewer_.getTable().notifyListeners(SWT.Selection, new Event());
- }
- }
- }
-
- private class ClientTypeContentProvider implements IStructuredContentProvider
- {
- /**
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(Object)
- */
- public Object[] getElements(Object value)
- {
- return ((Vector)value).toArray(new String[0]);
- }
-
- /**
- * @see org.eclipse.jface.viewers.IContentProvider#dispose()
- */
- public void dispose()
- {
- }
-
- /**
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(Viewer, Object, Object)
- */
- public void inputChanged(Viewer arg0, Object arg1, Object arg2)
- {
- }
- }
-
- private class ClientTypeLabelProvider extends LabelProvider
- {
- public ClientTypeLabelProvider()
- {
- }
-
- /**
- * @see org.eclipse.jface.viewers.ILabelProvider#getImage(Object)
- */
- public Image getImage(Object arg0)
- {
- return null;
- }
-
- /**
- * @see org.eclipse.jface.viewers.ILabelProvider#getText(Object)
- */
- public String getText(Object value)
- {
- IFacetedProjectTemplate template = ProjectFacetsManager.getTemplate( (String)value );
-
- return template.getLabel();
- }
- }
-
- protected class TableSelectionListener implements SelectionListener
- {
- private Button down;
- private Button up;
- private Table table;
-
- public TableSelectionListener(Button up, Button down, Table ownerTable)
- {
- this.up = up;
- this.down = down;
- this.table = ownerTable;
- }
-
- public void widgetDefaultSelected(SelectionEvent e)
- {
- widgetSelected(e);
- }
-
- public void widgetSelected(SelectionEvent e)
- {
- int i = table.getSelectionIndex();
- if (i == table.getItemCount() - 1) down.setEnabled(false);
- else if (i > -1) down.setEnabled(true);
- if (i == 0) up.setEnabled(false);
- else if (i > -1) up.setEnabled(true);
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ServerRuntimePreferencePage.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ServerRuntimePreferencePage.java
deleted file mode 100644
index 88abe51..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ServerRuntimePreferencePage.java
+++ /dev/null
@@ -1,366 +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
- * -------- -------- -----------------------------------------------------------
- * 20060728 151723 mahutch@ca.ibm.com - Mark Hutchinson
- * 20070109 130965 kathy@ca.ibm.com - Kathy Chan
- * 20080428 224726 pmoogk@ca.ibm.com - Peter Moogk
- * 20080512 180135 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.preferences;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionListChoices;
-
-import com.ibm.icu.text.Collator;
-
-
-/**
- *
- */
-public class ServerRuntimePreferencePage extends PreferencePage implements IWorkbenchPreferencePage, Listener
-{
- private String pluginId_= "org.eclipse.jst.ws.consumption.ui";
-
- /* CONTEXT_ID SRPF0001 for server preference on the server runtime preference page */
- private String INFOPOP_SRPF_SERVER_PREF = "SRPF0001";
- private Combo server_;
-
- /* CONTEXT_ID SRPF0002 for runtime preference on the server runtime preference page */
- private String INFOPOP_SRPF_RUNTIME_PREF = "SRPF0002";
- private Combo runtime_;
-
- /* CONTEXT_ID SRPF0003 for J2EE version preference on the server runtime preference page */
- /*
- private String INFOPOP_SRPF_J2EE_PREF = pluginId_ + ".SRPF0003";
- private Combo j2eeVersion_;
- */
-
- SelectionListChoices serverToRuntimeToJ2EE_;
-
- 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 uiUtils = new UIUtils(pluginId_);
-
- Composite page = new Composite(parent, SWT.NONE);
- GridLayout gl = new GridLayout();
- gl.numColumns = 2;
- page.setLayout(gl);
- GridData gd = new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL);
- page.setLayoutData(gd);
-
- server_ = uiUtils.createCombo(page,ConsumptionUIMessages.LABEL_SERVERS_LIST,
- ConsumptionUIMessages.TOOLTIP_SRPF_COMBO_SERVER,
- INFOPOP_SRPF_SERVER_PREF,
- SWT.SINGLE|SWT.BORDER|SWT.READ_ONLY);
-
- runtime_ = uiUtils.createCombo(page,ConsumptionUIMessages.LABEL_RUNTIMES_LIST,
- ConsumptionUIMessages.TOOLTIP_SRPF_COMBO_RUNTIME,
- INFOPOP_SRPF_RUNTIME_PREF,
- SWT.SINGLE|SWT.BORDER|SWT.READ_ONLY);
-
-/*
- j2eeVersion_ = uiUtils.createCombo(page,ConsumptionUIMessages.LABEL_J2EE_VERSION,
- ConsumptionUIMessages.TOOLTIP_SRPF_COMBO_J2EE,
- INFOPOP_SRPF_J2EE_PREF,
- SWT.SINGLE|SWT.BORDER|SWT.READ_ONLY);
-*/
-
- initializeValues();
- startListening();
- applyDialogFont(page);
- return page;
- }
-
- private void initializeValues()
- {
- PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
- serverToRuntimeToJ2EE_ = WebServiceRuntimeExtensionUtils2.getServerToRuntimeToJ2EE();
-
-
- setServerItems(serverToRuntimeToJ2EE_.getList().getList());
- String defaultServerText = context.getServerFactoryId();
- serverToRuntimeToJ2EE_.getList().setSelectionValue(defaultServerText);
- setServerSelection(defaultServerText);
-
- setRuntimeItems(serverToRuntimeToJ2EE_.getChoice().getList().getList());
- String defaultRuntimeText = context.getRuntimeId();
- serverToRuntimeToJ2EE_.getChoice().getList().setSelectionValue(defaultRuntimeText);
- setRuntimeSelection(defaultRuntimeText);
- }
-
- public void handleEvent(Event event)
- {
- if (server_ == event.widget)
- {
- handleServerSelected();
- }
- else if (runtime_ == event.widget)
- {
- handleRuntimeSelected();
- }
- }
-
- private void handleServerSelected()
- {
- stopListening();
-
- String selectedText = getServerSelection();
- serverToRuntimeToJ2EE_.getList().setSelectionValue(selectedText);
-
- // TODO (see bug 116025) - Since the server and runtime set in serverToRuntimeToJ2EE is just the list of
- // all servers and all runtime (i.e. no validation checking is being done), no need to update the runtime,
- // just keep the original value.
- //Update the runtime -------------------------------
-// setRuntimeItems(serverToRuntimeToJ2EE_.getChoice().getList().getList());
-// if (serverToRuntimeToJ2EE_.getChoice().getList().getList().length > 0)
-// serverToRuntimeToJ2EE_.getChoice().getList().setIndex(0);
-//
-// String newRuntimeText = serverToRuntimeToJ2EE_.getChoice().getList().getSelection();
-// if (newRuntimeText!=null && newRuntimeText.length()>0)
-// setRuntimeSelection(newRuntimeText);
-
- startListening();
- }
-
- private void handleRuntimeSelected()
- {
- stopListening();
-
- String selectedText = getRuntimeSelection();
- serverToRuntimeToJ2EE_.getChoice().getList().setSelectionValue(selectedText);
- startListening();
- }
-
-
- /**
- * Does anything necessary because the default button has been pressed.
- */
- protected void performDefaults()
- {
- super.performDefaults();
- setToDefaults();
- }
-
- private void setToDefaults()
- {
- PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
-
- String defaultServerText = context.getDefaultServerFactoryId();
- serverToRuntimeToJ2EE_.getList().setSelectionValue(defaultServerText);
- setServerSelection(defaultServerText);
-
- setRuntimeItems(serverToRuntimeToJ2EE_.getChoice().getList().getList());
- String defaultRuntimeText = context.getDefaultRuntimeId();
- serverToRuntimeToJ2EE_.getChoice().getList().setSelectionValue(defaultRuntimeText);
- setRuntimeSelection(defaultRuntimeText);
- }
-
- /**
- * 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()
- {
- PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
- context.setServerFactoryId(getServerSelection());
- context.setRuntimeId(getRuntimeSelection());
- }
-
- protected void performApply()
- {
- performOk();
- }
-
-
- private void startListening()
- {
- server_.addListener(SWT.Selection,this);
- runtime_.addListener(SWT.Selection,this);
- }
-
- private void stopListening()
- {
- server_.removeListener(SWT.Selection, this);
- runtime_.removeListener(SWT.Selection, this);
- }
-
- private void setServerItems(String[] factoryIds)
- {
-
- if (factoryIds != null)
- {
- ArrayList serverLabelsList = new ArrayList();
- for (int i=0;i<factoryIds.length;i++)
- {
- //String thisServerLabel = WebServiceServerRuntimeTypeRegistry.getInstance().getServerLabel(factoryIds[i]);
- String thisServerLabel = WebServiceRuntimeExtensionUtils2.getServerLabelById(factoryIds[i]);
- if (thisServerLabel!=null && thisServerLabel.length()>0)
- {
- serverLabelsList.add(thisServerLabel);
- }
-
- }
- String[] serverLabels = convertToStringArray(serverLabelsList.toArray());
- Collator collator = Collator.getInstance();
- Arrays.sort(serverLabels, collator);
- server_.setItems(serverLabels);
- }
-
- }
-
- private void setRuntimeItems(String[] ids)
- {
- if (ids != null)
- {
- String[] runtimeLabels = new String[ids.length];
- for (int i=0;i<ids.length;i++)
- {
- //runtimeLabels[i] = WebServiceServerRuntimeTypeRegistry.getInstance().getRuntimeLabel(ids[i]);
- runtimeLabels[i] = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(ids[i]);
- }
-
- //sort the labels (bug 151723)
- Collator collator = Collator.getInstance();
- Arrays.sort(runtimeLabels, collator);
- runtime_.setItems(runtimeLabels);
- }
-
- }
-
- /*
- private void setJ2EEItems(String[] versions)
- {
- if (versions != null)
- {
- String[] j2eeLabels = new String[versions.length];
- for (int i = 0; i < versions.length; i++)
- {
- String label = J2EEUtils.getLabelFromJ2EEVersion(versions[i]);
- if (label != null && label.length()>0)
- j2eeLabels[i] = label;
- else
- j2eeLabels[i] = ConsumptionUIMessages.LABEL_NA;
- }
- j2eeVersion_.setItems(j2eeLabels);
-
- //Disable the combo if it has no items.
- if (j2eeLabels.length > 0)
- j2eeVersion_.setEnabled(true);
- else
- j2eeVersion_.setEnabled(false);
- }
-
- }
- */
-
- private String getServerSelection()
- {
- String serverLabel = server_.getText();
- //return WebServiceServerRuntimeTypeRegistry.getInstance().getServerFactoryId(serverLabel);
- return WebServiceRuntimeExtensionUtils2.getServerFactoryId(serverLabel);
- }
-
- private String getRuntimeSelection()
- {
- String runtimeLabel = runtime_.getText();
- //return WebServiceServerRuntimeTypeRegistry.getInstance().getRuntimeId(runtimeLabel);
- return WebServiceRuntimeExtensionUtils2.getRuntimeId(runtimeLabel);
- }
-
- /*
- private String getJ2EESelection()
- {
- String j2eeLabel = j2eeVersion_.getText();
- return J2EEUtils.getJ2EEVersionFromLabel(j2eeLabel);
- }
- */
-
- private void setServerSelection(String factoryId)
- {
- //String label = WebServiceServerRuntimeTypeRegistry.getInstance().getServerLabel(factoryId);
- String label = WebServiceRuntimeExtensionUtils2.getServerLabelById(factoryId);
- setSelection(server_,label);
- }
-
- private void setRuntimeSelection(String id)
- {
- //String label = WebServiceServerRuntimeTypeRegistry.getInstance().getRuntimeLabel(id);
- String label = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(id);
- setSelection(runtime_,label);
- }
-
- /*
- private void setJ2EESelection(String version)
- {
- String label = J2EEUtils.getLabelFromJ2EEVersion(version);
- setSelection(j2eeVersion_, label);
- }
- */
-
- private void setSelection(Combo combo, String s)
- {
- String[] items = combo.getItems();
- for (int i=0; i<items.length; i++)
- {
- if (items[i].equals(s))
- {
- combo.select(i);
- return;
- }
- }
- }
-
- private String[] convertToStringArray(Object[] a)
- {
- if (a==null) return new String[0];
-
- int length = a.length;
- String[] sa = new String[length];
- for (int i=0; i<length; i++)
- {
- Object obj = a[i];
- if (obj instanceof String)
- {
- sa[i] = (String)obj;
- }
- }
- return sa;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/TransientProjectTopologyContext.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/TransientProjectTopologyContext.java
deleted file mode 100644
index 1102733..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/TransientProjectTopologyContext.java
+++ /dev/null
@@ -1,90 +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
- * -------- -------- -----------------------------------------------------------
- * 20060227 124392 rsinha@ca.ibm.com - Rupam Kuehner
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.preferences;
-
-
-public class TransientProjectTopologyContext implements ProjectTopologyContext
-{
- private String[] serviceTypes;
- private String[] defaultServiceTypes;
-
- private String[] clientTypes;
- private String[] defaultClientTypes;
-
- private boolean twoEARs;
-
- public TransientProjectTopologyContext () {}
-
- public void setServiceTypes(String[] serviceTypes)
- {
- this.serviceTypes = serviceTypes;
- }
- public String[] getServiceTypes()
- {
- return serviceTypes;
- }
-
- public void setClientTypes(String[] clientTypes)
- {
- this.clientTypes = clientTypes;
- }
- public String[] getClientTypes()
- {
- return clientTypes;
- }
-
- public void setUseTwoEARs(boolean use)
- {
- this.twoEARs = use;
- }
- public boolean isUseTwoEARs()
- {
- return twoEARs;
- }
-
- public ProjectTopologyContext copy() {
- TransientProjectTopologyContext context = new TransientProjectTopologyContext();
- context.setServiceTypes(getServiceTypes());
- context.setDefaultServiceTypes(getDefaultServiceTypes());
- context.setClientTypes(getClientTypes());
- context.setDefaultClientTypes(getDefaultClientTypes());
- context.setUseTwoEARs(isUseTwoEARs());
- return context;
- }
-
-
-public void setDefaultServiceTypes(String[] defaultServiceTypes)
-{
- this.defaultServiceTypes = defaultServiceTypes;
-}
-
-public String[] getDefaultServiceTypes()
-{
- return defaultServiceTypes;
-
-}
-
-
-public void setDefaultClientTypes(String[] defaultClientTypes)
-{
- this.defaultClientTypes = defaultClientTypes;
-}
-
-public String[] getDefaultClientTypes()
-{
- return defaultClientTypes;
-
-}
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/selection/SelectionTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/selection/SelectionTransformer.java
deleted file mode 100644
index 2397f2c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/selection/SelectionTransformer.java
+++ /dev/null
@@ -1,32 +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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.selection;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.Selection;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-
-public class SelectionTransformer implements Transformer
-{
- public Object transform(Object value)
- {
- IStructuredSelection inSelection = (IStructuredSelection)value;
- Selection outSelection = new Selection();
-
- if (inSelection != null)
- {
- outSelection.setSelection( inSelection.toArray() );
- }
-
- return outSelection;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartClientWidgetContributor.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartClientWidgetContributor.java
deleted file mode 100644
index 4a5a76d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartClientWidgetContributor.java
+++ /dev/null
@@ -1,54 +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.consumption.ui.server;
-
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-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 StartClientWidgetContributor implements INamedWidgetContributor
-{
- private IServer server_;
-
- public StartClientWidgetContributor( 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.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartClientWidgetFactory.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartClientWidgetFactory.java
deleted file mode 100644
index e677208..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartClientWidgetFactory.java
+++ /dev/null
@@ -1,70 +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
- * -------- -------- -----------------------------------------------------------
- * 20060529 141422 kathy@ca.ibm.com - Kathy Chan
- * 20080722 240231 gilberta@ca.ibm.com - Gilbert Andrews
- *
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.server;
-
-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.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.IWebServiceClient;
-
-public class StartClientWidgetFactory implements INamedWidgetContributorFactory
-{
- private IWebServiceClient webserviceClient_;
- private IContext context_;
-
- public INamedWidgetContributor getFirstNamedWidget()
- {
- IServer server = null;
-
- if( webserviceClient_ != null && webserviceClient_.getWebServiceClientInfo().getServerInstanceId() != null && context_.getRun())
- {
- server = ServerCore.findServer(webserviceClient_.getWebServiceClientInfo().getServerInstanceId() );
- }
-
- if( server != null && server.getServerState() != IServer.STATE_STARTED )
- {
- return new StartClientWidgetContributor( server );
- }
-
- return null;
- }
-
- public INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor)
- {
- return null;
- }
-
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- dataRegistry.addMapping( PreClientDevelopCommand.class, "WebService", StartClientWidgetFactory.class );
- dataRegistry.addMapping( PreClientDevelopCommand.class, "Context", StartClientWidgetFactory.class );
- }
-
- public void setWebService( IWebServiceClient webserviceClient )
- {
- webserviceClient_ = webserviceClient;
- }
-
- public void setContext ( IContext context )
- {
- context_ = context;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartServerWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartServerWidget.java
deleted file mode 100644
index 5e62fef..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartServerWidget.java
+++ /dev/null
@@ -1,446 +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
- * -------- -------- -----------------------------------------------------------
- * 20070314 176886 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.server;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.IJobChangeEvent;
-import org.eclipse.core.runtime.jobs.IJobManager;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.core.runtime.jobs.JobChangeAdapter;
-import org.eclipse.jface.wizard.ProgressMonitorPart;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.command.StartServerCommand;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.osgi.util.NLS;
-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.Display;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.context.TransientResourceContext;
-import org.eclipse.wst.command.internal.env.eclipse.BaseStatusHandler;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseStatusHandler;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.server.core.IServer;
-
-public class StartServerWidget extends SimpleWidgetDataContributor
-{
- private IServer server_;
- private IStatus status_;
- private Listener statusListener_;
- private Button button_;
- private JobChangeAdapter jobChangeAdapter_;
- private Text serverStateText_;
- private ProgressMonitorPart progressMonitor_;
- private String pluginId_;
- private Composite buttonGroup_;
-
- /*CONTEXT_ID SSWP0001 Start the server button. */
- private String INFOPOP_SSWP_SERVER_BUTTON = "SSWP0001";
-
- public StartServerWidget( IServer server )
- {
- pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-
- server_ = server;
-
- jobChangeAdapter_ = new JobChangeAdapter()
- {
- public void done(final IJobChangeEvent event)
- {
- Display.getDefault().asyncExec( new Runnable()
- {
- public void run()
- {
- if( !progressMonitor_.isDisposed() )
- {
- setServerState();
- progressMonitor_.done();
- reportErrorIfRequired( (StartServerJob)event.getJob() );
- }
- }
- });
- }
- };
- }
-
- public WidgetDataEvents addControls(Composite parent, Listener statusListener)
- {
- statusListener_ = statusListener;
-
- UIUtils uiUtils = new UIUtils( pluginId_ );
- Composite group = uiUtils.createComposite( parent, 1 );
-
- Text text1 = uiUtils.createText( group, null, null, null, SWT.READ_ONLY );
- text1.setText( NLS.bind(ConsumptionUIMessages.LABEL_START_SERVER_TEXT1, new String[]{ server_.getName() } ));
-
- Text text2 = uiUtils.createText( group, null, null, null, SWT.READ_ONLY );
- text2.setText( NLS.bind(ConsumptionUIMessages.LABEL_START_SERVER_TEXT2, new String[]{ server_.getName() } ));
-
- Text text3 = uiUtils.createText( group, null, null, null, SWT.READ_ONLY );
- text3.setText( NLS.bind(ConsumptionUIMessages.LABEL_START_SERVER_TEXT3, new String[]{ server_.getName() } ));
-
- Text text4 = uiUtils.createText( group, null, null, null, SWT.READ_ONLY );
- text4.setText( NLS.bind(ConsumptionUIMessages.LABEL_START_SERVER_TEXT4, new String[]{ server_.getName() } ));
-
- buttonGroup_ = uiUtils.createComposite( group, 2,-1, 0 );
- serverStateText_ = uiUtils.createText( buttonGroup_, null, null, null, SWT.READ_ONLY );
- serverStateText_.setLayoutData( new GridData() );
-
- button_ = uiUtils.createPushButton( buttonGroup_,
- ConsumptionUIMessages.LABEL_START_SERVER_BUTTON,
- ConsumptionUIMessages.TOOLTIP_START_SERVER_BUTTON,
- INFOPOP_SSWP_SERVER_BUTTON );
-
- button_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- serverStateText_.setText( getStateMessage( ConsumptionUIMessages.TEXT_SERVER_STATUS, ConsumptionUIMessages.TEXT_SERVER_STARTING ) );
- progressMonitor_.beginTask( getStateMessage( ConsumptionUIMessages.TEXT_SERVER_MSG, ConsumptionUIMessages.TEXT_SERVER_STARTING ), IProgressMonitor.UNKNOWN );
- button_.setEnabled( false );
- buttonGroup_.pack();
- startServerJob();
- }
- } );
-
- progressMonitor_ = new ProgressMonitorPart( group, new GridLayout() );
- progressMonitor_.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ));
-
- setServerState();
- return this;
- }
-
- public IStatus getStatus()
- {
- return status_;
- }
-
- private void setServerState()
- {
- int state = server_.getServerState();
-
- switch( state )
- {
- case IServer.STATE_STARTED:
- {
- status_ = Status.OK_STATUS;
- button_.setEnabled( false );
- serverStateText_.setText( getStateMessage( ConsumptionUIMessages.TEXT_SERVER_STATUS, ConsumptionUIMessages.TEXT_SERVER_STARTED ) );
-
- break;
- }
-
- case IServer.STATE_STARTING:
- {
- status_ = StatusUtils.errorStatus( "" );
- button_.setEnabled( false );
- serverStateText_.setText( getStateMessage( ConsumptionUIMessages.TEXT_SERVER_STATUS, ConsumptionUIMessages.TEXT_SERVER_STARTING ) );
- progressMonitor_.beginTask( getStateMessage( ConsumptionUIMessages.TEXT_SERVER_MSG, ConsumptionUIMessages.TEXT_SERVER_STARTING ), IProgressMonitor.UNKNOWN );
-
- // The server is still starting so we need to reconnect to the job
- // that is starting it.
- startServerJob();
- break;
- }
-
- default:
- {
- status_ = StatusUtils.errorStatus( "" );
- button_.setEnabled( true );
- serverStateText_.setText( getStateMessage( ConsumptionUIMessages.TEXT_SERVER_STATUS, ConsumptionUIMessages.TEXT_SERVER_STOPPED ) );
- break;
- }
- };
-
- statusListener_.handleEvent( null );
- buttonGroup_.pack();
- }
-
- private String getStateMessage( String mainKey, String subKey )
- {
- return NLS.bind( mainKey, new String[]{ subKey } );
- }
-
- // Connect to an existing server thread otherwise start a new one.
- private void startServerJob()
- {
- IJobManager jobManager = Platform.getJobManager();
- Job[] jobs = jobManager.find( StartServerFamily );
- StartServerJob startServerJob = null;
-
- // There may be more than one job starting for different servers.
- // Therefore, we need to find the one for our server if it is available.
- for( int index = 0; index < jobs.length; index++ )
- {
- StartServerJob jobFound = (StartServerJob)jobs[index];
-
- if( jobFound.getServer() == server_ )
- {
- startServerJob = jobFound;
- break;
- }
- }
-
- if( startServerJob != null )
- {
- synchronized( StartServerFamily )
- {
- IStatus status = startServerJob.getStatus();
-
- // We are using status to determine if the job has completed or not.
- // Normally, we would not get here if the job had already completed,
- // but there is a slim window where the job manager gives us the job
- // and then it immediately completes.
- if( status == null )
- {
- // The job had not completed yet so we will add a job change listener.
- // We are adding the job listener here so that we don't have to assume
- // that this instance of this widget is the same as the previous instance.
- // If startServerJob already has "jobChangeAdapter_" added to it this
- // method call will not have an effect.(Which is what we want.)
- startServerJob.addJobChangeListener( jobChangeAdapter_ );
-
- // Note: this job was reporting progress to different progressMonitor_
- // control. We need to tell the job that it should report progress
- // to our new progressMonitor_ control on this wizard page.
- ProgressMonitorWrapper monitor = (ProgressMonitorWrapper)startServerJob.getMonitor();
- monitor.setMonitor( progressMonitor_ );
- }
- else
- {
- // The job completed before we had a chance to add the job change listener
- // Therefore, we will just call jobChangeAdapter_ directly to notify
- // the UI that the job has completed.
- jobChangeAdapter_.done( null );
- }
- }
- }
- else
- {
- startServerJob = new StartServerJob();
- startServerJob.addJobChangeListener( jobChangeAdapter_ );
- startServerJob.schedule();
- }
- }
-
- private void reportErrorIfRequired( StartServerJob serverJob )
- {
- IStatus status = serverJob.getStatus();
-
- if( status.getSeverity() == Status.ERROR )
- {
- Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
- EclipseStatusHandler handler = new EclipseStatusHandler( shell );
-
- handler.reportError( status );
- }
- }
-
- final private static String StartServerFamily = "StartServerFamily";
-
- // This class is used to start up the server in an Eclipse job.
- private class StartServerJob extends Job
- {
- private IStatus status_ = null;
- private ProgressMonitorWrapper envMonitor_;
-
- public StartServerJob()
- {
- super( "StartServerJob" );
-
- envMonitor_ = new ProgressMonitorWrapper( progressMonitor_ );
- }
-
- public IServer getServer()
- {
- return server_;
- }
-
- public ProgressMonitorWrapper getMonitor()
- {
- return envMonitor_;
- }
-
- public boolean belongsTo(Object family)
- {
- return family == StartServerFamily;
- }
-
- protected IStatus run(IProgressMonitor monitor)
- {
- BaseStatusHandler handler = new BaseStatusHandler();
- TransientResourceContext resourceContext = new TransientResourceContext();
- EclipseEnvironment environment = new EclipseEnvironment( null,resourceContext, handler );
- StartServerCommand serverCommand = new StartServerCommand( false );
-
- serverCommand.setServerInstanceId( server_.getId() );
- serverCommand.setEnvironment( environment );
-
- try
- {
- setStatus( serverCommand.execute( envMonitor_, null ) );
- }
- catch( Throwable exc )
- {
- exc.printStackTrace();
- setStatus( StatusUtils.errorStatus( exc ) );
- }
-
- return Status.OK_STATUS;
- }
-
- // Calls to this method need to first synchronize on the
- // StartServerFamily object.
- public IStatus getStatus()
- {
- return status_;
- }
-
- private void setStatus( IStatus status )
- {
- synchronized( StartServerFamily )
- {
- status_ = status;
- }
- }
- }
-
- private class ProgressMonitorWrapper implements IProgressMonitor
- {
- private IProgressMonitor monitor_ = new NullProgressMonitor();
-
- public ProgressMonitorWrapper( IProgressMonitor monitor )
- {
- monitor_ = monitor;
- }
-
- public void setMonitor( IProgressMonitor monitor )
- {
- monitor_ = monitor;
- }
-
- public void beginTask(final String name, final int totalWork)
- {
- Display.getDefault().asyncExec( new Runnable()
- {
- public void run()
- {
- if( !progressMonitor_.isDisposed() )
- {
- monitor_.beginTask( name, totalWork );
- }
- }
- } );
- }
-
- public void done()
- {
- Display.getDefault().asyncExec( new Runnable()
- {
- public void run()
- {
- if( !progressMonitor_.isDisposed() )
- {
- monitor_.done();
- }
- }
- } );
- }
-
- public void internalWorked(final double work)
- {
- Display.getDefault().asyncExec( new Runnable()
- {
- public void run()
- {
- if( !progressMonitor_.isDisposed() )
- {
- monitor_.internalWorked( work );
- }
- }
- } );
- }
-
- public boolean isCanceled()
- {
- return progressMonitor_.isDisposed() ? false : monitor_.isCanceled();
- }
-
- public void setCanceled(boolean value)
- {
- if( !progressMonitor_.isDisposed() )
- {
- monitor_.setCanceled( value );
- }
- }
-
- public void setTaskName(final String name)
- {
- Display.getDefault().asyncExec( new Runnable()
- {
- public void run()
- {
- if( !progressMonitor_.isDisposed() )
- {
- monitor_.setTaskName( name );
- }
- }
- } );
- }
-
- public void subTask( final String name)
- {
- Display.getDefault().asyncExec( new Runnable()
- {
- public void run()
- {
- if( !progressMonitor_.isDisposed() )
- {
- monitor_.subTask( name );
- }
- }
- } );
- }
-
- public void worked(final int work)
- {
- Display.getDefault().asyncExec( new Runnable()
- {
- public void run()
- {
- if( !progressMonitor_.isDisposed() )
- {
- monitor_.worked( work );
- }
- }
- } );
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AbstractHandlersWidgetDefaultingCmd.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AbstractHandlersWidgetDefaultingCmd.java
deleted file mode 100644
index d92f6ab..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AbstractHandlersWidgetDefaultingCmd.java
+++ /dev/null
@@ -1,121 +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
- * -------- -------- -----------------------------------------------------------
- * 20060404 134913 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-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.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.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-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;
-
-
-/**
- * AbstractHandlersWidgetDefaultingCmd
- *
- * Initialize and load the handlers data
- */
-public abstract class AbstractHandlersWidgetDefaultingCmd extends AbstractDataModelOperation
-{
-
- private IStructuredSelection initialSelection_;
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
- IStatus status = Status.OK_STATUS;
-
- IStructuredSelection selection = initialSelection_;
- if (selection == null) {
- status = StatusUtils.errorStatus( ConsumptionUIMessages.MSG_ERROR_TASK_EXCEPTED );
- env.getStatusHandler().reportError(status);
- return status;
- }
-
-
- return status;
-
- }
-
-
- public List getClientHandlers(){
- return null;
- }
-
- public void setInitialSelection(IStructuredSelection initSelection){
- this.initialSelection_ = initSelection;
- }
-
- public IStructuredSelection getInitialSelection(){
- return this.initialSelection_;
- }
-
- protected IResource getResourceFromInitialSelection()
- {
- if (initialSelection_ != null && initialSelection_.size() == 1)
- {
- Object obj = initialSelection_.getFirstElement();
- if (obj != null)
- {
- try
- {
- IResource resource = ResourceUtils.getResourceFromSelection(obj);
- return resource;
- } catch(CoreException e)
- {
- return null;
- }
- }
- }
- return null;
- }
-
- public IProject getProject(){
-
- IResource resource = getResourceFromInitialSelection();
- if (resource != null)
- {
- return ResourceUtils.getProjectOf( resource.getFullPath() );
- }
-
- return null;
- }
-
- public String getComponentName(){
- IResource resource = getResourceFromInitialSelection();
- if (resource!=null) {
- IPath absolutePath = resource.getFullPath();
- if (absolutePath.isAbsolute()) {
- return absolutePath.segment(1);
- }
- }
- return null;
- }
-
-// public WebServiceEditModel getWebServiceEditModel() {
-// WebServicesManager wsm = new WebServicesManager();
-// IProject project = getProject();
-// return wsm.getWSEditModel(project);
-// }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AbstractObjectSelectionLaunchable.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AbstractObjectSelectionLaunchable.java
deleted file mode 100644
index 1c00cca..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AbstractObjectSelectionLaunchable.java
+++ /dev/null
@@ -1,53 +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
- * -------- -------- -----------------------------------------------------------
- * 20060420 135912 joan@ca.ibm.com - Joan Haggarty
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.widgets.Shell;
-
-public abstract class AbstractObjectSelectionLaunchable implements IObjectSelectionLaunchable {
-
- public int launch(Shell shell) {
- return -1;
- }
-
- public IStatus validateSelection(IStructuredSelection objectSelection) {
- // subclass should override this method
- return Status.OK_STATUS;
- }
-
- public IStructuredSelection getObjectSelection() {
- // subclass should override this method
- return new StructuredSelection();
- }
-
- public void setInitialSelection(IStructuredSelection initialSelection) {
- // subclass should override this method
- }
-
- public String getObjectSelectionDisplayableString()
- {
- // subclass should override this method
- return "";
- }
-
- public boolean validate(String s) {
- // subclass should override this method
- return true;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AddHandlerDialog.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AddHandlerDialog.java
deleted file mode 100644
index 045aa36..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AddHandlerDialog.java
+++ /dev/null
@@ -1,265 +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
- * -------- -------- -----------------------------------------------------------
- * 20060404 134913 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060529 143518 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.jst.ws.internal.ui.dialog.DialogUtils;
-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.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-
-
-public class AddHandlerDialog extends Dialog implements Listener {
-
- private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-
- private boolean validateOn_;
- private boolean isClient_;
- private boolean isMultipleServices_;
- private String className;
- private String name;
- private String selectedPortName;
-
- private Text classNameText;
- private Text nameText;
- private Combo portNameCombo;
-
- // ----TOOLTIPS Section----
- /* CONTEXT_ID AHDL0001 for the Handler Config Page */
- private final String INFOPOP_TEXT_HANDLER_NAME = "AHDL0001"; //$NON-NLS-1$
-
- /* CONTEXT_ID AHDL0002 for the Handler Config Page */
- private final String INFOPOP_TEXT_HANDLER_CLASS = "AHDL0002"; //$NON-NLS-1$
-
- /* CONTEXT_ID AHDL0001 for the Handler Config Page */
- private final String INFOPOP_TEXT_HANDLER_PORT = "AHDL0003"; //$NON-NLS-1$
-
- private Button beanClassBrowseButton_;
- /*CONTEXT_ID PBCL0003 for the Bean Class Browse button of the Bean Selection Page*/
- private String INFOPOP_PBCL_BUTTON_BEAN_CLASS_BROWSE = "PBCL0003";
-
- public AddHandlerDialog( Shell shell, boolean isClientHandler)
- {
- super(shell);
- setShellStyle(getShellStyle() | SWT.RESIZE);
- isClient_ = isClientHandler;
- }
-
- protected Control createContents(Composite parent) {
- Composite comp = (Composite) super.createContents(parent);
- parent.getShell().pack();
- return comp;
- }
-
- protected Control createDialogArea(Composite parent) {
- validateOn_ = false;
- UIUtils uiUtils = new UIUtils(pluginId_);
-
- Shell thisShell = parent.getShell();
- if (thisShell == null) {
- thisShell = createShell();
- }
- thisShell.setText(ConsumptionUIMessages.DIALOG_TITLE_WS_ADD_HANDLER);
-
- Composite composite = (Composite) super.createDialogArea(parent);
-
- Composite sourceLocationComp = uiUtils.createComposite(composite, 3);
-
- classNameText = uiUtils.createText(sourceLocationComp, ConsumptionUIMessages.LABEL_TEXT_HANDLER_CLASS, ConsumptionUIMessages.TOOLTIP_TEXT_HANDLER_CLASS, INFOPOP_TEXT_HANDLER_CLASS, SWT.SINGLE | SWT.BORDER);
- classNameText.addListener(SWT.Modify,this);
-
- beanClassBrowseButton_ = uiUtils.createPushButton( sourceLocationComp, ConsumptionUIMessages.BUTTON_BROWSE_CLASSES,
- ConsumptionUIMessages.TOOLTIP_PBCL_BUTTON_BEAN_CLASS_BROWSE,
- INFOPOP_PBCL_BUTTON_BEAN_CLASS_BROWSE );
- beanClassBrowseButton_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleBrowseClasses();
- }
- } );
-
- nameText = uiUtils.createText(sourceLocationComp, ConsumptionUIMessages.LABEL_TEXT_HANDLER_NAME, ConsumptionUIMessages.TOOLTIP_TEXT_HANDLER_NAME, INFOPOP_TEXT_HANDLER_NAME, SWT.SINGLE | SWT.BORDER );
- nameText.addListener(SWT.Modify, this);
-
- // dummy label for column 3.
- new Label( sourceLocationComp, SWT.NONE );
-
- if (!isClient_ && !isMultipleServices_){
- portNameCombo = uiUtils.createCombo(sourceLocationComp, ConsumptionUIMessages.LABEL_TEXT_HANDLER_PORT, ConsumptionUIMessages.TOOLTIP_TEXT_HANDLER_PORT, INFOPOP_TEXT_HANDLER_PORT, SWT.SINGLE | SWT.BORDER );
- portNameCombo.addListener(SWT.Modify, this);
-
- // dummy label for column 3.
- new Label( sourceLocationComp, SWT.NONE );
- }
- validateOn_ = true;
- return composite;
- }
-
- private void handleBrowseClasses()
- {
- Shell shell = getShell();
- IType itype = DialogUtils.browseClassesAsIType(shell, ResourcesPlugin.getWorkspace().getRoot().getProjects(), new ProgressMonitorDialog(shell));
-
- if( itype != null )
- {
- classNameText.setText(itype.getFullyQualifiedName());
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
- */
- public void handleEvent(Event event) {
- if (!validateOn_)
- return;
- if (classNameText == event.widget) {
- handleClassNameTextEvent();
- validateTextFieldEntries();
- return;
- }
- if (nameText == event.widget) {
- handleNameTextEvent();
- validateTextFieldEntries();
- return;
- }
- if (portNameCombo == event.widget) {
- handlePortNameTextEvent();
- validateTextFieldEntries();
- return;
- }
- }
-
- private void handleClassNameTextEvent(){
- className = classNameText.getText();
- if (className.lastIndexOf(".java") != -1){
- nameText.setText(className.substring(0, className.lastIndexOf(".java")));
- }
- else {
- nameText.setText(className);
- }
-
- if (className.lastIndexOf(".") != -1){
- nameText.setText(className.substring(className.lastIndexOf(".")+1, className.length()));
- }
- name = nameText.getText();
- }
-
- private void handleNameTextEvent() {
- name = nameText.getText();
-
- }
-
- private void handlePortNameTextEvent(){
- selectedPortName = portNameCombo.getText();
- }
-
- private void disableOKButton() {
- if (getButton(0) != null)
- getButton(0).setEnabled(false);
- }
-
- private void enableOKButton() {
- if (getButton(0) != null)
- getButton(0).setEnabled(true);
- }
-
- private void validateTextFieldEntries(){
- if (classNameText.getText().equals("")){
- disableOKButton();
- return;
- }
- if (nameText.getText().equals("")){
- disableOKButton();
- return;
- }
- if (!isClient_ && !isMultipleServices_){
- if (portNameCombo.getText()!=null && portNameCombo.getText().equals("")){
- disableOKButton();
- return;
- }
- else if (portNameCombo.getText()==null) {
- disableOKButton();
- return;
- }
- }
-
- enableOKButton();
-
-
- }
-
- /**
- * @return Returns the className.
- */
- public String getClassName() {
- if (className.lastIndexOf(".java") != -1){
- return className.substring(0, className.lastIndexOf(".java"));
- }
- else {
- return className;
- }
- }
- /**
- * @param className The className to set.
- */
- public void setClassName(String className) {
- this.className = className;
- }
- /**
- * @return Returns the name.
- */
- public String getName() {
- return name;
- }
- /**
- * @param name The name to set.
- */
- public void setName(String name) {
- this.name = name;
- }
- /**
- * @return Returns the portName.
- */
- public String getPortName() {
- return selectedPortName;
- }
- /**
- * @param portName The portName to set.
- */
- public void setPortNames(String[] portNames) {
- portNameCombo.setItems(portNames);
- portNameCombo.select(0);
- }
-
- public void setIsMultipleServices(boolean isMultipleServices){
- this.isMultipleServices_ = isMultipleServices;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/CheckWSDLValidationCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/CheckWSDLValidationCommand.java
deleted file mode 100644
index 3962d82..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/CheckWSDLValidationCommand.java
+++ /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
- * -------- -------- -----------------------------------------------------------
- * 20060420 120714 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.IJobManager;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ValidateWSDLJob;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Choice;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-
-
-public class CheckWSDLValidationCommand extends AbstractDataModelOperation
-{
-
- public CheckWSDLValidationCommand () {
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
-
- IJobManager jobManager = Platform.getJobManager();
- Job[] jobs = jobManager.find( ValidateWSDLJob.VALIDATE_WSDL_JOB_FAMILY );
- ValidateWSDLJob existingValidateWSDLJob = null;
-
- if( jobs.length > 0 )
- {
- for (int i=0; i<jobs.length; i++) {
- existingValidateWSDLJob = (ValidateWSDLJob)jobs[i];
-
- if (existingValidateWSDLJob.getState() != Job.NONE) {
- if (ignoreWSDLValidation(env)) {
- // if don't want to wait for validation, cancel existing validation job
- existingValidateWSDLJob.cancel();
- return Status.OK_STATUS;
- } else {
- // Setting the error string to an empty string so that the command engine would not
- // pop-up another error message when the user decided to wait for WSDL validation.
- return StatusUtils.errorStatus( "" );
- }
- }
- }
- }
-
- return Status.OK_STATUS;
-
- }
-
- private boolean ignoreWSDLValidation(IEnvironment env) {
- if (!WSPlugin.getInstance().getWaitForWSDLValidationContext().getPersistentWaitForWSDLValidation())
- return true; // do not want to wait for WSDL validation, i.e. Ignore all
-
- // give a warning message with the options to stop, ignore this one, or
- // ignore all coming messages
- IStatus status_ = StatusUtils.warningStatus( ConsumptionUIMessages.STILL_VALIDATING_WSDL );
- // adding all messages from WSI Incompliances
-
- Choice ignoreChoice = new Choice('C', ConsumptionUIMessages.CANCEL_VALIDATION_LABEL,
- ConsumptionUIMessages.CANCEL_VALIDATION_DESCRIPTION);
- Choice ignoreAllChoice = new Choice('A', ConsumptionUIMessages.CANCEL_ALL_VALIDATION_LABEL,
- ConsumptionUIMessages.CANCEL_ALL_VALIDATION_DESCRIPTION);
- Choice cancelChoice = new Choice('W', ConsumptionUIMessages.WAIT_VALIDATION_LABEL,
- ConsumptionUIMessages.WAIT_VALIDATION_DESCRIPTION);
-
- Choice result = env.getStatusHandler().report(status_,
- new Choice[] { ignoreChoice, ignoreAllChoice, cancelChoice });
-
- // if the user closes the message box or selects ignore continue
- if (result == null
- || (result.getLabel().equals(ignoreChoice.getLabel()))) {
- return true;
- // if the user selects ignore all, change the preference
- } else if (result.getLabel().equals(ignoreAllChoice.getLabel())) {
- // update ignore WSDL validation preference
- WSPlugin.getInstance().getWaitForWSDLValidationContext().setWaitForWSDLValidation(false);
- return true;
- }
- // if the user selects to cancel , do not continue with the command
- else if (result.getLabel().equals(cancelChoice.getLabel())) {
- return false;
- }
- return true;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetDefaultingCommand.java
deleted file mode 100644
index 449c472..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,329 +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
- * -------- -------- -----------------------------------------------------------
- * 20060404 134913 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IFile;
-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.emf.ecore.resource.Resource;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.applicationclient.componentcore.util.AppClientArtifactEdit;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.client.ApplicationClientResource;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EJBResource;
-import org.eclipse.jst.j2ee.ejb.internal.modulecore.util.EJBArtifactEditUtilities;
-import org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroupType;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebAppResource;
-import org.eclipse.jst.j2ee.webservice.wsclient.Handler;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesResource;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.common.HandlerServiceRefHolder;
-import org.eclipse.jst.ws.internal.consumption.ui.helper.WebServicesManager;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-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;
-
-/**
- * ClientHandlersWidgetDefaultingCommand
- *
- * Initialize and load the handlers data
- */
-public class ClientHandlersWidgetDefaultingCommand extends AbstractHandlersWidgetDefaultingCmd {
-
- private WebServicesManager webServicesManager_;
-
- private IProject project_;
-
- private String serviceRefName_ = null;
-
- private List wsServiceRefs_;
-
- private HandlerServiceRefHolder[] handlerServiceRefHolder_;
- private String errorStatusMsg_ = null;
- private boolean isMultipleSelection_;
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
- IStatus status = Status.OK_STATUS;
-
- webServicesManager_ = WebServicesManager.getInstance();
-
- IStructuredSelection selection = getInitialSelection();
- if (selection == null) {
- status = StatusUtils.errorStatus( ConsumptionUIMessages.MSG_ERROR_TASK_EXCEPTED );
- env.getStatusHandler().reportError(status);
- return status;
- }
- else if (selection.size()>1){
- status = processMultipleHandlers();
- return status;
- }
-
- status = processHandlers();
- return status;
-
- }
-
- /**
- * For processing handlers
- * @return
- */
- public IStatus processHandlers() {
- try {
-
- Collection selectedServiceRefs = getWSServiceRefsFromSelection(); // get initial selection values
- if (selectedServiceRefs==null || selectedServiceRefs.isEmpty()){
- //report no Web service client is available
- return StatusUtils.errorStatus(ConsumptionUIMessages.MSG_ERROR_WEB_SERVICE_CLIENTS_NOT_FOUND);
- }
- wsServiceRefs_ = webServicesManager_.getAllWorkspaceServiceRefs();
-
- if (wsServiceRefs_ != null) {
- int numberOfServiceRefs = wsServiceRefs_.size();
- handlerServiceRefHolder_ = new HandlerServiceRefHolder[numberOfServiceRefs];
-
- for (int i = 0; i < numberOfServiceRefs; i++) {
- ServiceRef wsServiceRef = (ServiceRef) wsServiceRefs_.get(i);
- Vector handlers = new Vector();
- List wsHandlers = wsServiceRef.getHandlers();
-
- for (int k = 0; k < wsHandlers.size(); k++) {
-
- Handler wsHandler = (Handler) wsHandlers.get(k);
-
- HandlerTableItem handlerItem = new HandlerTableItem();
- handlerItem.setHandler(wsHandler);
- handlerItem.setHandlerName(wsHandler.getHandlerName());
- handlerItem.setHandlerClassName(wsHandler.getHandlerClass().getQualifiedName());
- handlerItem.setWsDescRef(wsServiceRef);
-
- handlers.add(handlerItem);
- }
- String wsServiceRefName = wsServiceRef.getServiceRefName();
- handlerServiceRefHolder_[i] = new HandlerServiceRefHolder();
- handlerServiceRefHolder_[i].setHandlerList(handlers);
- handlerServiceRefHolder_[i].setServiceRef(wsServiceRef);
- handlerServiceRefHolder_[i].setServiceRefName(wsServiceRefName);
-
- }
-
- }
-
- }
- catch (Exception e) {
- return StatusUtils.errorStatus( ConsumptionUIMessages.MSG_ERROR_TASK_EXCEPTED, e);
- }
- return Status.OK_STATUS;
- }
-
- public IStatus processMultipleHandlers(){
- ServiceRef[] serviceRefs = getServiceRefs();
- if (errorStatusMsg_ != null){
- return StatusUtils.errorStatus(errorStatusMsg_);
- }
- isMultipleSelection_ = true;
-
- handlerServiceRefHolder_ = new HandlerServiceRefHolder[serviceRefs.length];
- Vector handlers = new Vector();
- for (int i=0;i<serviceRefs.length;i++){
-
- String refName = serviceRefs[i].getServiceRefName();
- handlerServiceRefHolder_[i] = new HandlerServiceRefHolder();
- handlerServiceRefHolder_[i].setHandlerList(handlers);
- handlerServiceRefHolder_[i].setServiceRefName(refName);
- handlerServiceRefHolder_[i].setServiceRef(serviceRefs[i]);
- }
- return Status.OK_STATUS;
- }
-
- /**
- * @return Returns the isGenSkeletonEnabled_.
- */
- public boolean getGenSkeletonEnabled() {
- if (isMultipleSelection_)
- return false;
- return true;
- }
-
-
- public String getServiceRefName() {
- return this.serviceRefName_;
- }
-
- public IProject getClientProject() {
- return project_;
- }
-
- private ServiceRef[] getServiceRefs(){
- IStructuredSelection initSel = getInitialSelection();
- ServiceRef[] serviceRefs = new ServiceRef[initSel.size()];
- Iterator iter = initSel.iterator();
- for (int i=0;i<initSel.size();i++) {
- Object obj = iter.next();
- if (obj instanceof ServiceRef){
- serviceRefs[i] = (ServiceRef)obj;
- }
- else{
- errorStatusMsg_ = ConsumptionUIMessages.MSG_ERROR_INVALID_MULTIPLE_SERVICE_SELECT;
- return null;
- }
- }
- return serviceRefs;
-}
-
- private Collection getWSServiceRefsFromSelection() {
-
- IStructuredSelection initSel = getInitialSelection();
- if (initSel != null && initSel.size() == 1) {
- Object obj = initSel.getFirstElement();
- ServiceRef serviceRef = null;
- if (obj instanceof ServiceRef) {
- // Client ServiceRef
- serviceRef = (ServiceRef) obj;
- serviceRefName_ = serviceRef.getServiceRefName();
- project_ = ProjectUtilities.getProject(serviceRef);
- }
- else if (obj instanceof WebServiceNavigatorGroupType) {
- WebServiceNavigatorGroupType wsngt = (WebServiceNavigatorGroupType) obj;
- serviceRef = wsngt.getServiceRef();
- serviceRefName_ = serviceRef.getServiceRefName();
- project_ = ProjectUtilities.getProject(serviceRef);
- }
- else if (obj instanceof IFile){
- Resource res = WorkbenchResourceHelperBase.getResource((IFile)obj, true);
- Collection serviceRefs = null;
- if (res instanceof WebServicesResource) {
- // webservicesclient.xml for J2EE 1.3
- WebServicesResource wsRes = (WebServicesResource)res;
- serviceRefs = wsRes.getWebServicesClient().getServiceRefs();
- if (!serviceRefs.isEmpty()) {
- ServiceRef ref = (ServiceRef)((List)serviceRefs).get(0);
- serviceRefName_ = ref.getServiceRefName();
- project_ = ProjectUtilities.getProject(ref);
- return serviceRefs;
- }
- return null;
- }
- else {
- if(res instanceof WebAppResource){
- // web.xml for J2EE 1.4
- WebAppResource webAppRes = (WebAppResource)res;
- serviceRefs = webAppRes.getWebApp().getServiceRefs();
- }
- else if (res instanceof EJBResource){
- EJBResource ejbRes = (EJBResource)res;
- serviceRefs = webServicesManager_.getServiceRefs(ejbRes.getEJBJar());
- }
- else if (res instanceof ApplicationClientResource){
- ApplicationClientResource appClientRes = (ApplicationClientResource)res;
- serviceRefs = webServicesManager_.getServiceRefs(appClientRes.getApplicationClient());//appClientRes.getApplicationClient().getServiceRefs();
- }
- if (serviceRefs!=null && serviceRefs.size()>0) {
- ServiceRef ref = (ServiceRef)((List)serviceRefs).get(0);
- serviceRefName_ = ref.getServiceRefName();
- project_ = ProjectUtilities.getProject(ref);
- }
- return serviceRefs;
- }
- }
-
- // This section is for obtaining all the serviceRefs from the project, given that the initial selection
- // was from the J2EE view (ServiceRef or WebServiceNavigatorGroupType), it will select the right serviceRef
- if (project_==null){
- project_ = getProject();
- }
- if (project_==null){
- return null;
- }
-
- if (J2EEUtils.isWebComponent(project_)) {
- WebArtifactEdit webEdit = null;
- try {
- IVirtualComponent vc = ComponentCore.createComponent(project_);
- webEdit = WebArtifactEdit.getWebArtifactEditForRead(vc);
- if (webEdit != null)
- {
- WebApp webApp = (WebApp) webEdit.getDeploymentDescriptorRoot();
- if (webApp != null) {
- return webServicesManager_.getServiceRefs(webApp);
- }
- }
- }
- finally{
- if(webEdit!=null)
- webEdit.dispose();
- }
- }
- else if (J2EEUtils.isEJBComponent(project_)){
-
- IVirtualComponent vc = ComponentCore.createComponent(project_);
- EJBJar ejbJar = EJBArtifactEditUtilities.getEJBJar(vc);
- if (ejbJar!=null) {
- return webServicesManager_.getServiceRefs(ejbJar);
- }
- }
- else if (J2EEUtils.isAppClientComponent(project_)){
- IVirtualComponent vc = ComponentCore.createComponent(project_);
- AppClientArtifactEdit appEdit = null;
- try {
- appEdit = AppClientArtifactEdit.getAppClientArtifactEditForRead(vc);
- if (appEdit!=null){
- ApplicationClient appClient = appEdit.getApplicationClient();
- if (appClient !=null){
- return webServicesManager_.getServiceRefs(appClient);
- }
- }
- }
- finally{
- if(appEdit!=null){
- appEdit.dispose();
- }
- }
- }
-
-
- }
- return null;
- }
-
- public Collection getWsServiceRefs(){
- return this.wsServiceRefs_;
- }
-
- public boolean getIsMultipleSelection(){
- return this.isMultipleSelection_;
- }
-
- public HandlerServiceRefHolder[] getHandlerServiceRefHolder(){
- return this.handlerServiceRefHolder_;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetOutputCommand.java
deleted file mode 100644
index 4cee18a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetOutputCommand.java
+++ /dev/null
@@ -1,207 +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
- * -------- -------- -----------------------------------------------------------
- * 20060404 134913 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060517 142339 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Hashtable;
-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.jst.j2ee.applicationclient.componentcore.util.AppClientArtifactEdit;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.webservice.wsclient.Handler;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.Webservice_clientFactoryImpl;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.JavaMOFUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.common.HandlerServiceRefHolder;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.internal.emf.utilities.EtoolsCopyUtility;
-
-/*
- * Provide a way to externalize the edited fields and create new handlers
- *
- */
-public class ClientHandlersWidgetOutputCommand extends AbstractDataModelOperation
-{
-
- private HandlerServiceRefHolder[] handlerServiceRefHolder_;
- private Hashtable oldWSServiceRefsToHandlersTable_;
- private Hashtable newWSServiceRefsToHandlersTable_;
- private IProject project_;
- private boolean isMultipleSelection_;
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IStatus status = Status.OK_STATUS;
-
- try {
-
- if (isMultipleSelection_) {
- if (handlerServiceRefHolder_ != null) {
- // add new handler to internal model if it doesn't already exist
- for (int i = 0; i < handlerServiceRefHolder_.length; i++) {
- handlerServiceRefHolder_[i].addHandlerToServiceRef();
- saveEditModel(handlerServiceRefHolder_[i].getProject());
- }
-
- }
-
- }
- else {
- oldWSServiceRefsToHandlersTable_ = new Hashtable();
- newWSServiceRefsToHandlersTable_ = new Hashtable();
-
- if (handlerServiceRefHolder_ != null) {
-
- for (int i = 0; i < handlerServiceRefHolder_.length; i++) {
-
- ServiceRef wsServiceRef =handlerServiceRefHolder_[i].getServiceRef();
-
- List wsHandlers = wsServiceRef.getHandlers();
- oldWSServiceRefsToHandlersTable_.put(wsServiceRef, wsHandlers);
- newWSServiceRefsToHandlersTable_.put(wsServiceRef, new ArrayList());
- }
-
- //Enumeration e = handlersTable_.keys();
- for (int j=0;j<handlerServiceRefHolder_.length;j++) {
-
- List handlerTableItems_ = handlerServiceRefHolder_[j].getHandlerList();
- if (handlerTableItems_ != null) {
- // form Handler tables
- for (int i = 0; i < handlerTableItems_.size(); i++) {
-
- HandlerTableItem hti = (HandlerTableItem) handlerTableItems_.get(i);
- Object wsModelRef = hti.getWsDescRef();
- if (wsModelRef != null && wsModelRef instanceof ServiceRef) {
- ServiceRef wsRef = (ServiceRef) wsModelRef;
-
- Object handler = hti.getHandler();
- if (handler != null && handler instanceof Handler) {
- // clone it
- Handler clonedHandler = (Handler) EtoolsCopyUtility.createCopy((Handler) handler);
- ((List) newWSServiceRefsToHandlersTable_.get(wsRef)).add(clonedHandler);
- }
- else {
- // create it
- Webservice_clientFactory wsClientFactory = new Webservice_clientFactoryImpl();
- Handler newHandler = wsClientFactory.createHandler();
- newHandler.setHandlerName(hti.getHandlerName());
-
- JavaClass javaClass = JavaMOFUtils.getJavaClass(hti.getHandlerClassName(), project_);
- if (javaClass != null) {
- newHandler.setHandlerClass(javaClass);
- }
-
- ((List) newWSServiceRefsToHandlersTable_.get(wsRef)).add(newHandler);
- }
-
- }
-
- }
- }
- }
-
- // add handlers to ports
- addHandlersToServiceRefs();
- }
-
- // save the artifact edit model
- saveEditModel();
- }
-
- }
- catch (Exception e)
- {
- return StatusUtils.errorStatus(ConsumptionUIMessages.MSG_ERROR_TASK_EXCEPTED, e);
- }
-
- return status;
- }
-
- private void saveEditModel() {
- ArtifactEdit artifactEdit = null;
- try {
- if (J2EEUtils.isWebComponent(project_)) {
- artifactEdit = WebArtifactEdit.getWebArtifactEditForWrite(project_);
- }
- else if (J2EEUtils.isEJBComponent(project_)){
- artifactEdit = EJBArtifactEdit.getEJBArtifactEditForWrite(project_);
- }
- else if (J2EEUtils.isAppClientComponent(project_)){
- artifactEdit = AppClientArtifactEdit.getAppClientArtifactEditForWrite(project_);
- }
- }
- finally {
- if (artifactEdit!=null) {
- artifactEdit.save(null);
- artifactEdit.dispose();
- }
- }
- }
-
- private void saveEditModel(IProject project){
- project_ = project;
- saveEditModel();
- }
-
- private void addHandlersToServiceRefs() {
- try {
- Enumeration refsToHandlers = newWSServiceRefsToHandlersTable_.keys();
- while (refsToHandlers.hasMoreElements()) {
- ServiceRef serviceRef = (ServiceRef) refsToHandlers.nextElement();
- if (serviceRef != null) {
- List handlers = (List) newWSServiceRefsToHandlersTable_.get(serviceRef);
- List modelHandlers = (List) oldWSServiceRefsToHandlersTable_.get(serviceRef);
- modelHandlers.clear();
- modelHandlers.addAll(handlers);
- }
- }
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- }
-
-
- public void setClientProject(IProject project) {
- this.project_ = project;
- }
-
- /**
- * An array of HandlerDescriptionHolders
- * @return
- */
- public void setHandlerServiceRefHolder(HandlerServiceRefHolder[] handlerHolders){
- this.handlerServiceRefHolder_ = handlerHolders;
- }
-
- public void setIsMultipleSelection(boolean isMulitpleSelection) {
- this.isMultipleSelection_ = isMulitpleSelection;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidget.java
deleted file mode 100644
index 7e6029e..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidget.java
+++ /dev/null
@@ -1,549 +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
- * -------- -------- -----------------------------------------------------------
- * 20060407 135415 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060417 136390/136159 joan@ca.ibm.com - Joan Haggarty
- * 20060413 135581 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060420 135912 joan@ca.ibm.com - Joan Haggarty
- * 20060424 138052 kathy@ca.ibm.com - Kathy Chan
- * 20060425 137831 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060509 119296 pmoogk@ca.ibm.com - Peter Moogk
- * 20060529 141422 kathy@ca.ibm.com - Kathy Chan
- * 20060612 145081 pmoogk@ca.ibm.com - Peter Moogk
- * 20060725 149351 makandre@ca.ibm.com - Andrew Mak, Deleted service definition keeps reappearing
- * 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
- * 20060907 156211 makandre@ca.ibm.com - Andrew Mak, Selecting service definition invalidated project config when creating web service java client
- * 20061212 159911 makandre@ca.ibm.com - Andrew Mak, changing service definition resets some configuration fields
- * 20060125 159911 kathy@ca.ibm.com - Kathy Chan, Remove unused method and imports
- * 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
- * 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.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.jst.ws.internal.consumption.common.WSDLParserFactory;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.command.data.EclipseIPath2URLStringTransformer;
-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.object.Timer;
-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.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-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.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-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.ui.IWorkbench;
-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.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.jst.ws.internal.ui.common.ComboWithHistory;
-
-
-public class ClientWizardWidget extends SimpleWidgetDataContributor implements Runnable
-{
- private WebServiceClientTypeWidget clientWidget_;
- private Button overwriteButton_;
- private Button monitorService_;
-
- private ComboWithHistory serviceImpl_;
- private Button browseButton_;
- private WSDLSelectionDialog wsdlDialog_;
- private String componentName_;
- private IProject project_;
- private String webServiceURI_;
- private WebServicesParser parser_;
- private ResourceContext resourceContext_;
-
- private Listener statusListener_;
- private ModifyListener objectModifyListener_ ;
- private int validationState_;
- private boolean validObjectSelection_ = true;
- private WSDLSelectionWidgetWrapper wsdlValidatorWidget_;
-
- private Timer timer_ = null;
-
- /* CONTEXT_ID WSWSCEN0020 for the Service Implemenation text field of the Scenario Page */
- private String INFOPOP_WSWSCEN_TEXT_SERVICE_IMPL = "WSWSCEN0020";
-
-
- /* CONTEXT_ID WSWSCEN0014 for the monitor service checkbox of the Scenario page */
- private String INFOPOP_WSWSCEN_CHECKBOX_MONITOR_SERVICE = "WSWSCEN0014";
- /* CONTEXT_ID WSWSCEN0030 for the Overwrite Files checkbox of the Scenario Page */
- private String INFOPOP_WSWSCEN_CHECKBOX_OVERWRITE = "WSWSCEN0030";
- /* CONTEXT_ID WSWSCEN0001 for the Scenario Page */
- private String INFOPOP_WSWSCEN_PAGE = "WSWSCEN0001";
-
- /**
- * Run this ClientWizardWidget, which validates the entry field values.
- */
- public void run() {
- validationState_ = ValidationUtils.VALIDATE_ALL;
- statusListener_.handleEvent(null);
- if (validObjectSelection_)
- callObjectTransformation(project_,
- wsdlValidatorWidget_.getComponentName(),
- wsdlValidatorWidget_.getWsdlURI());
- }
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener)
- {
- String pluginId = "org.eclipse.jst.ws.consumption.ui";
- UIUtils utils = new UIUtils( pluginId );
- utils.createInfoPop(parent, INFOPOP_WSWSCEN_PAGE);
-
- statusListener_ = statusListener;
- validationState_ = ValidationUtils.VALIDATE_ALL;
- // Create text field and browse for service selection
- Composite typeComposite = utils.createComposite(parent, 3);
- serviceImpl_ = utils.createComboWithHistory(typeComposite, ConsumptionUIMessages.LABEL_WEBSERVICEDEF,
- ConsumptionUIMessages.TOOLTIP_WSWSCEN_TEXT_IMPL,
- INFOPOP_WSWSCEN_TEXT_SERVICE_IMPL, SWT.LEFT | SWT.BORDER, WebServiceConsumptionUIPlugin.getInstance().getDialogSettings() );
-
- Object layoutData = serviceImpl_.getLayoutData();
- if (layoutData instanceof GridData) {
- ((GridData)layoutData).widthHint = 225;
- }
-
- objectModifyListener_ = new ModifyListener(){
- public void modifyText(ModifyEvent e) {
- if (serviceImpl_.getText().indexOf(':') > 0) {
- timer_ = Timer.newInstance(timer_, Display.getCurrent(), ClientWizardWidget.this);
- timer_.startTimer();
- }
- else
- run();
- }
- };
-
- serviceImpl_.addModifyListener(objectModifyListener_);
-
- browseButton_ = utils.createPushButton(typeComposite,
- ConsumptionUIMessages.BUTTON_BROWSE, ConsumptionUIMessages.TOOLTIP_WSWSCEN_BUTTON_BROWSE_IMPL, null);
-
- browseButton_.addSelectionListener(new WSDLBrowseListener());
-
- utils.createHorizontalSeparator(parent, 1);
-
- Composite clientComposite = utils.createComposite( parent, 1, 0, 0 );
-
- clientWidget_ = new WebServiceClientTypeWidget(true);
- clientWidget_.addControls(clientComposite , statusListener );
-
- // Create test service check box.
- Composite buttonGroup = utils.createComposite(clientComposite,1);
-
- // Create monitor service check box.
- monitorService_ = utils.createCheckbox(buttonGroup , ConsumptionUIMessages.CHECKBOX_MONITOR_WEBSERVICE,
- ConsumptionUIMessages.TOOLTIP_PWPR_CHECKBOX_MONITOR_SERVICE,
- INFOPOP_WSWSCEN_CHECKBOX_MONITOR_SERVICE);
-
- //show overwrite if it is enabled in the preferences
- if (getResourceContext().isOverwriteFilesEnabled()) {
- Label prefSeparator = utils.createHorizontalSeparator(parent, 1);
- prefSeparator.setText("File Options");
- 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;
- }
-
- public void setResourceContext( ResourceContext context )
- {
- resourceContext_ = context;
- }
-
- public ResourceContext getResourceContext()
- {
- if (resourceContext_ == null) {
- resourceContext_ = WebServicePlugin.getInstance()
- .getResourceContext();
- }
- return resourceContext_;
- }
-
- public void setClientTypeRuntimeServer( TypeRuntimeServer ids )
- {
- clientWidget_.setTypeRuntimeServer( ids );
- }
-
- public void setClientProjectName(String name)
- {
- clientWidget_.setClientProjectName(name);
- }
-
- public void setClientEarProjectName(String name)
- {
- clientWidget_.setClientEarProjectName(name);
- }
-
- public void setClientComponentType(String name)
- {
- clientWidget_.setClientComponentType(name);
- }
-
- public void setClientNeedEAR(boolean b)
- {
- clientWidget_.setClientNeedEAR(b);
- }
-
- public String getClientRuntimeId()
- {
- return clientWidget_.getClientRuntimeId();
- }
-
- public String getClientEarProjectName()
- {
- return clientWidget_.getClientEarProjectName();
- }
-
- public String getClientProjectName()
- {
- return clientWidget_.getClientProjectName();
- }
-
- public String getClientComponentType()
- {
- return clientWidget_.getClientComponentType();
- }
-
- public boolean getClientNeedEAR()
- {
- return clientWidget_.getClientNeedEAR();
- }
-
- public void setWebServiceURI(String uri)
- {
- webServiceURI_ = uri;
- }
- public void externalize() {
- super.externalize();
- if (getClientTypeRuntimeServer() != null ) {
- serviceImpl_.storeWidgetHistory(getClientTypeRuntimeServer().getTypeId());
- }
- }
-public void internalize() {
- serviceImpl_.removeModifyListener(objectModifyListener_);
- if (webServiceURI_ != null && webServiceURI_.length() != 0)
- serviceImpl_.setText(webServiceURI_);
- if (getClientTypeRuntimeServer() != null ) {
- serviceImpl_.restoreWidgetHistory(getClientTypeRuntimeServer().getTypeId());
- }
- serviceImpl_.addModifyListener(objectModifyListener_);
-
- EclipseIPath2URLStringTransformer transformer = new EclipseIPath2URLStringTransformer();
- webServiceURI_ = (String) transformer.transform(webServiceURI_);
-}
-
- public void setProject(IProject project)
- {
- project_ = project;
- }
- public void setComponentName(String name)
- {
- componentName_ = name;
- }
-
- public String getWebServiceURI()
- {
- return webServiceURI_ ;
- }
-
- public String getWsdlURI()
- {
- return getWebServiceURI();
- }
-
- public IProject getProject()
- {
- return project_;
- }
-
- public String getComponentName()
- {
- return componentName_ ;
- }
-
- public WebServicesParser getWebServicesParser()
- {
- return WSDLParserFactory.getWSDLParser();
- }
-
- public void setWebServicesParser(WebServicesParser parser)
- {
- parser_ = getWebServicesParser();
- clientWidget_.setWebServicesParser(parser_);
- }
-
- public TypeRuntimeServer getClientTypeRuntimeServer()
- {
- return clientWidget_.getTypeRuntimeServer();
- }
-
- public void setInstallClient( Boolean install)
- {
- clientWidget_.setInstallClient( install );
- }
-
- public Boolean getInstallClient()
- {
- return clientWidget_.getInstallClient();
- }
-
- public Boolean getTestService()
- {
- return clientWidget_.getTestClient();
- }
-
- public void setTestService( Boolean value )
- {
- clientWidget_.setTestClient(value);
- }
-
- public int getClientGeneration()
- {
- return clientWidget_.getClientGeneration();
- }
-
- public void setClientGeneration(int value)
- {
- clientWidget_.setClientGeneration(value);
- }
-
- 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();
- }
-
- public void setStartClient(Boolean start) {
- clientWidget_.setStartClient( start );
- }
-
- public Boolean getStartClient() {
- return clientWidget_.getStartClient();
- }
-
- public Boolean getMonitorService()
- {
- return new Boolean(monitorService_.getSelection());
- }
-
- public void setMonitorService(Boolean value)
- {
- monitorService_.setSelection(value.booleanValue());
- }
-
- public IStatus getStatus() {
-
- validObjectSelection_ = false; // assume false at first
-
- IStatus missingFieldStatus = checkMissingFieldStatus();
- if (missingFieldStatus.getSeverity() == IStatus.ERROR) {
- return missingFieldStatus;
- }
-
- IStatus invalidServiceImplStatus = checkServiceImplTextStatus();
- if (invalidServiceImplStatus.getSeverity() == IStatus.ERROR) {
- return invalidServiceImplStatus;
- }
-
- IStatus possibleErrorStatus = checkErrorStatus();
- if (possibleErrorStatus.getSeverity() == IStatus.ERROR) {
- return possibleErrorStatus;
- }
-
- IStatus possibleWarningStatus = checkWarningStatus();
- if (possibleWarningStatus.getSeverity() == IStatus.WARNING) {
- return possibleWarningStatus;
- }
-
- // if no errors or warnings were found, clear the validation state.
- validationState_ = ValidationUtils.VALIDATE_NONE;
- clientWidget_.setValidationState(ValidationUtils.VALIDATE_NONE);
-
- return Status.OK_STATUS;
- }
-
- private IStatus checkMissingFieldStatus() {
-
- if (validationState_ == ValidationUtils.VALIDATE_ALL) {
- if (serviceImpl_.getText().trim().length() == 0) {
- return StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_NO_SERVICE_SELECTION, new String[]{ConsumptionUIMessages.LABEL_WEBSERVICEIMPL}));
- }
- }
-
- IStatus clientMissingFieldsStatus = clientWidget_.checkMissingFieldStatus();
- if (clientMissingFieldsStatus.getSeverity() == IStatus.ERROR) {
- return clientMissingFieldsStatus;
- }
-
- return Status.OK_STATUS;
-
- }
-
- private IStatus checkErrorStatus() {
- IStatus clientSideErrorStatus = clientWidget_.checkErrorStatus();
- if (clientSideErrorStatus.getSeverity() == IStatus.ERROR) {
- return clientSideErrorStatus;
- }
- return Status.OK_STATUS;
- }
-
- private IStatus checkWarningStatus() {
- IStatus clientWarningStatus = clientWidget_.checkWarningStatus();
- if (clientWarningStatus.getSeverity() == IStatus.WARNING) {
- return clientWarningStatus;
- }
- return Status.OK_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 (wsdlValidatorWidget_ == null)
- wsdlValidatorWidget_ = new WSDLSelectionWidgetWrapper();
-
- validObjectSelection_ = wsdlValidatorWidget_.validate(fieldText);
-
- if (!validObjectSelection_)
- {
- return StatusUtils.errorStatus(ConsumptionUIMessages.MSG_INVALID_SERVICE_DEF);
- }
-
- return Status.OK_STATUS;
- }
-
- private void callObjectTransformation(IProject project, String componentName,
- String wsdlURI)
- {
- WSDLSelectionOutputCommand wsdlOutputCommand = new WSDLSelectionOutputCommand();
- wsdlOutputCommand.setComponentName(componentName);
- wsdlOutputCommand.setProject(project);
- wsdlOutputCommand.setWsdlURI(wsdlURI);
- wsdlOutputCommand.setTestService(getTestService().booleanValue());
- wsdlOutputCommand.setWebServicesParser(getWebServicesParser());
-
- wsdlOutputCommand.execute(null, null);
-
- setComponentName(wsdlOutputCommand.getComponentName());
- setProject(wsdlOutputCommand.getProject());
- setWebServicesParser(wsdlOutputCommand.getWebServicesParser());
- setWebServiceURI(wsdlOutputCommand.getWsdlURI());
-
- // bug 159911: our starting point is a wsdl, we should not need to
- // refresh the runtime everytime the user specify a new wsdl path
- // refreshClientRuntimeSelection();
- }
-
- private class WSDLBrowseListener implements SelectionListener
- {
- public void widgetDefaultSelected(SelectionEvent e) {
- // TODO Auto-generated method stub
-
- }
- public void widgetSelected(SelectionEvent e) {
-
- // bug 269097 - Use the Web Service Client's dialog shell, not the platform workbench's shell.
- wsdlDialog_ = new WSDLSelectionDialog(Display.getCurrent().getActiveShell(),
- new PageInfo(ConsumptionUIMessages.DIALOG_TITILE_SERVICE_IMPL_SELECTION, "",
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new WSDLSelectionWidgetWrapper();
- }
- }));
-
- wsdlDialog_.setComponentName(getComponentName());
- wsdlDialog_.setProject(getProject());
- wsdlDialog_.setWebServiceURI( serviceImpl_.getText() );
-
- int result = wsdlDialog_.open();
-
- if (result == Dialog.OK)
- {
- serviceImpl_.removeModifyListener(objectModifyListener_);
- serviceImpl_.setText(wsdlDialog_.getDisplayableSelectionString());
- serviceImpl_.addModifyListener(objectModifyListener_);
-
- // call WSDLSelectionOutputCommand to carry out any transformation on the objectSelection
- callObjectTransformation(project_,
- wsdlDialog_.getComponentName(), wsdlDialog_.getWebServiceURI());
-
- validationState_ = ValidationUtils.VALIDATE_ALL;
- clientWidget_.setValidationState(ValidationUtils.VALIDATE_ALL);
- statusListener_.handleEvent(null); //validate the page
- }
- wsdlDialog_ = null;
- }
- }
-}
-
-
-
-
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetDefaultingCommand.java
deleted file mode 100644
index 9892c8b..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,159 +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
- * -------- -------- -----------------------------------------------------------
- * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060524 142635 gilberta@ca.ibm.com - Gilbert Andrews
- * 20060529 141422 kathy@ca.ibm.com - Kathy Chan
- * 20060728 150560 kathy@ca.ibm.com - Kathy Chan
- * 20060728 151078 kathy@ca.ibm.com - Kathy Chan
- * 20080402 225378 makandre@ca.ibm.com - Andrew Mak, Client wizard runtime/server defaulting is not respecting the preference
- * 20080528 234487 makandre@ca.ibm.com - Andrew Mak, Performance degradation in Web service client gen
- * 20080613 236523 makandre@ca.ibm.com - Andrew Mak, Overwrite setting on Web service wizard is coupled with preference
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-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.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.env.eclipse.BaseEclipseEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class ClientWizardWidgetDefaultingCommand extends AbstractDataModelOperation
-{
- private int clientGeneration_;
- private boolean developClient_;
- private boolean assembleClient_;
- private boolean deployClient_;
- private boolean installClient_;
- private boolean startClient_;
- private boolean testClient_;
- private boolean clientOnly_ = false;
- private TypeRuntimeServer clientTypeRuntimeServer_;
-
- public ClientWizardWidgetDefaultingCommand() {
- }
-
-
- /**
- * @param clientOnly Set to true for if called from ClientWidgetWizard
- */
- public ClientWizardWidgetDefaultingCommand(boolean clientOnly) {
- clientOnly_ = clientOnly;
- }
-
- public Boolean getTestService()
- {
- return new Boolean( getScenarioContext().getTestWebService() );
- }
-
- public Boolean getMonitorService()
- {
- return new Boolean( getScenarioContext().getMonitorWebService());
- }
-
- public boolean getInstallClient()
- {
- return installClient_;
- }
-
- public boolean getRunTestClient()
- {
- return getScenarioContext().isLaunchSampleEnabled() ;
- }
-
- public int getClientGeneration()
- {
- return clientGeneration_;
- }
-
- public ResourceContext getResourceContext()
- {
- return ((BaseEclipseEnvironment) getEnvironment()).getResourceContext();
- }
-
- // Current ScenarioContext is used to default the first page of the wizard. The
- // properties in ScenarioContext are mapped individual. Therefore, ScenarioContext
- // should not also be mapped.
- protected ScenarioContext getScenarioContext()
- {
- return WebServicePlugin.getInstance().getScenarioContext();
- }
-
- // TODO Set client name defaults here.
- public TypeRuntimeServer getClientTypeRuntimeServer()
- {
- if (clientTypeRuntimeServer_ == null) {
- String type = getScenarioContext().getClientWebServiceType();
- String runtime = WebServiceRuntimeExtensionUtils2.getDefaultClientRuntimeValueFor(type);
- String factoryID = WebServiceRuntimeExtensionUtils2.getDefaultClientServerValueFor(type);
- clientTypeRuntimeServer_ = new TypeRuntimeServer();
-
- clientTypeRuntimeServer_.setTypeId( type );
- clientTypeRuntimeServer_.setRuntimeId( runtime );
- clientTypeRuntimeServer_.setServerId( factoryID );
- }
-
- return clientTypeRuntimeServer_;
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
- {
- defaultClientScale();
- return Status.OK_STATUS;
- }
-
- protected void defaultClientScale() {
- clientGeneration_ = getScenarioContext().getGenerateClient();
-
- if (clientOnly_ && clientGeneration_ == ScenarioContext.WS_NONE) {
- developClient_ = true;
- assembleClient_ = true;
- deployClient_ = true;
- clientGeneration_ = ScenarioContext.WS_DEPLOY;
- } else {
- developClient_ = clientGeneration_ <= ScenarioContext.WS_DEVELOP;
- assembleClient_ = clientGeneration_ <= ScenarioContext.WS_ASSEMBLE;
- deployClient_ = clientGeneration_ <= ScenarioContext.WS_DEPLOY;
- }
- installClient_ = clientGeneration_ <= ScenarioContext.WS_INSTALL;
- startClient_ = clientGeneration_ <= ScenarioContext.WS_START;
- testClient_ = clientGeneration_ <= ScenarioContext.WS_TEST;
- }
-
- public boolean getDevelopClient() {
- return developClient_;
- }
-
- public boolean getAssembleClient() {
- return assembleClient_;
- }
-
- public boolean getDeployClient() {
- return deployClient_;
- }
-
- public boolean getStartClient() {
- return startClient_;
- }
-
- public boolean getTestClient() {
- return testClient_;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetOutputCommand.java
deleted file mode 100644
index 35511e1..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetOutputCommand.java
+++ /dev/null
@@ -1,180 +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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import org.eclipse.core.commands.ExecutionException;
-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.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class ClientWizardWidgetOutputCommand extends AbstractDataModelOperation
-{
- private boolean testService_;
- private boolean monitorService;
- private ResourceContext resourceContext_;
- private TypeRuntimeServer clientIds_;
- private boolean installClient_;
-
- private String webServiceURI_;
- private IProject project_;
- private String componentName_;
- private boolean runTestClient_;
- private boolean developClient_;
- private boolean assembleClient_;
- private boolean deployClient_;
- private boolean startClient_;
- private boolean testClient_;
-
- public boolean getTestService()
- {
- return testService_;
- }
-
- public void setTestService( boolean testService )
- {
- testService_ = testService;
- }
-
- public boolean getRunTestClient()
- {
- return runTestClient_;
- }
-
- public void setRunTestClient( boolean runTestClient )
- {
- runTestClient_ = runTestClient;
- }
-
- public void setInstallClient( boolean installClient)
- {
- installClient_ = installClient;
- }
-
- public boolean getInstallClient()
- {
- return installClient_;
- }
-
- public boolean getDevelopClient() {
- return developClient_;
- }
-
- public void setDevelopClient(boolean developClient) {
- this.developClient_ = developClient;
- }
-
- public boolean getAssembleClient() {
- return assembleClient_;
- }
-
- public void setAssembleClient(boolean assembleClient) {
- this.assembleClient_ = assembleClient;
- }
-
- public boolean getDeployClient() {
- return deployClient_;
- }
-
- public void setDeployClient(boolean deployClient) {
- this.deployClient_ = deployClient;
- }
-
- public boolean getStartClient() {
- return startClient_;
- }
-
- public void setStartClient(boolean startClient) {
- this.startClient_ = startClient;
- }
-
- public boolean getTestClient() {
- return testClient_;
- }
-
- public void setTestClient(boolean testClient) {
- this.testClient_ = testClient;
- }
- public boolean getMonitorService()
- {
- return monitorService;
- }
-
- public void setMonitorService(boolean monitorService)
- {
- this.monitorService = monitorService;
- }
-
- public ResourceContext getResourceContext()
- {
-
- return resourceContext_;
- }
-
- public void setResourceContext( ResourceContext context )
- {
- resourceContext_ = context;
- }
-
- public TypeRuntimeServer getClientTypeRuntimeServer()
- {
- return clientIds_;
- }
-
- public void setClientTypeRuntimeServer( TypeRuntimeServer clientIds )
- {
- clientIds_ = clientIds;
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
- {
- return Status.OK_STATUS;
- }
-
- public String getWsdlURI()
- {
- return webServiceURI_ ;
- }
-
- public void setWsdlURI(String uri)
- {
- webServiceURI_ = uri;
- }
-
- public void setProject(IProject project)
- {
- project_ = project;
- }
-
- public IProject getProject()
- {
- return project_;
- }
-
- public void setComponentName(String name)
- {
- componentName_ = name;
- }
-
- public String getComponentName()
- {
- return componentName_ ;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigClientHandlersTableWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigClientHandlersTableWidget.java
deleted file mode 100644
index c615cce..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigClientHandlersTableWidget.java
+++ /dev/null
@@ -1,637 +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
- * -------- -------- -----------------------------------------------------------
- * 20060404 134913 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060426 135614 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.common.HandlerServiceRefHelper;
-import org.eclipse.jst.ws.internal.consumption.ui.common.HandlerServiceRefHolder;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-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.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Text;
-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;
-
-/**
- * ConfigClientHandlersTreeWidget
- *
- */
-public class ConfigClientHandlersTableWidget extends SimpleWidgetDataContributor {
-
- private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-
- private Composite parent_;
- private String outputLocation_;
- private Composite webServiceRefComp_;
- private Combo webServiceRefCombo_;
- private Text webServiceDescText_ = null;
- private Table handlersTable_;
- private TableViewer tableViewer_;
- private Button addButton_;
- private Button removeButton_;
- private Button genSkeletonRadioButton_;
- private Composite sourceLocationComp_;
- private Combo sourceLocationCombo_;
-
- private HandlerServiceRefHolder[] handlerServiceRefHolder_;
- private HandlerServiceRefHolder currentHSRH_;
- private Hashtable pathsTable_ = new Hashtable();
- private boolean isMultipleSelection_ = false;
- private boolean isGenSkeletonEnabled_;
- private String serviceRefName_;
- private int DEFAULT_COLUMN_WIDTH = 150;
-
- // ----TOOLTIPS Section----
- /* CONTEXT_ID HDLR0001 for the Handler Config Page */
- private final String INFOPOP_HDLR_WS_HANDLERS = "HDLR0001"; //$NON-NLS-1$
-
- /* CONTEXT_ID HDLR0002 for the Handler Config Page */
- private final String INFOPOP_HDLR_GEN_SKELETON = "HDLR0002"; //$NON-NLS-1$
-
- /* CONTEXT_ID HDLR0003 for the Handler Config Page */
- private final String INFOPOP_COMBO_SOURCE_LOC = "HDLR0003"; //$NON-NLS-1$
-
- /* CONTEXT_ID HDLR0004 for the Handler Config Page */
- private final String INFOPOP_WS_CLIENT_REF = "HDLR0004"; //$NON-NLS-1$
-
- // ------------------------
-
- public ConfigClientHandlersTableWidget() {
- super();
- }
-
- public WidgetDataEvents addControls(Composite parent, Listener statusListener) {
-
- UIUtils uiUtils = new UIUtils(pluginId_);
-
- parent_ = parent;
-
- // Web service reference combo
- webServiceRefComp_ = uiUtils.createComposite(parent_, 2);
-
- Composite displayComp = new Composite(parent_, SWT.NONE);
- GridLayout gridlayout = new GridLayout(2, false);
- displayComp.setLayout(gridlayout);
- displayComp.setLayoutData(uiUtils.createFillAll());
-
- final Composite handlersComp = uiUtils.createComposite(displayComp, 1);
- GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL |GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING
- | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_VERTICAL | GridData.FILL_VERTICAL);
- handlersComp.setLayoutData(griddata);
- handlersComp.setSize(130, 600);
-
- Composite buttonsComp = uiUtils.createComposite(displayComp, 1);
- griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
- buttonsComp.setLayoutData(griddata);
-
- Text handlersText = new Text(handlersComp, SWT.READ_ONLY);
- handlersText.setText(ConsumptionUIMessages.LABEL_HANDLERS_CONFIG);
- GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.horizontalSpan = 2;
- handlersText.setLayoutData(gd);
-
- handlersTable_ = uiUtils.createTable(handlersComp, ConsumptionUIMessages.TOOLTIP_EDIT_WS_HANDLERS, INFOPOP_HDLR_WS_HANDLERS, SWT.MULTI | SWT.FULL_SELECTION | SWT.BORDER);
- handlersTable_.setHeaderVisible(true);
- handlersTable_.setLinesVisible(true);
-
- // empty space
- Label wsLabel = new Label(buttonsComp, SWT.NONE);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.horizontalSpan = 2;
- wsLabel.setLayoutData(gd);
-
- Button moveUpButton = uiUtils.createPushButton(buttonsComp, ConsumptionUIMessages.LABEL_BUTTON_MOVE_UP, null, null);
- GridData muGriddata = new GridData();
- Point musize = moveUpButton.computeSize(SWT.DEFAULT, SWT.DEFAULT);
- moveUpButton.addSelectionListener(new SelectionListener() {
-
- public void widgetSelected(SelectionEvent event) {
- handleMoveUpButtonSelected(event);
- }
-
- public void widgetDefaultSelected(SelectionEvent event) {
- }
- });
-
- Button moveDownButton = uiUtils.createPushButton(buttonsComp, ConsumptionUIMessages.LABEL_BUTTON_MOVE_DOWN, null, null);
- GridData mdGriddata = new GridData();
- Point mdsize = moveDownButton.computeSize(SWT.DEFAULT, SWT.DEFAULT);
- moveDownButton.addSelectionListener(new SelectionListener() {
-
- public void widgetSelected(SelectionEvent event) {
- handleMoveDownButtonSelected(event);
- }
-
- public void widgetDefaultSelected(SelectionEvent event) {
- }
- });
-
- // empty space
- wsLabel = new Label(buttonsComp, SWT.NONE);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.horizontalSpan = 2;
- wsLabel.setLayoutData(gd);
-
- addButton_ = uiUtils.createPushButton(buttonsComp, ConsumptionUIMessages.LABEL_BUTTON_ADD, null, null);
- GridData addGriddata = new GridData();
- Point addSize = addButton_.computeSize(SWT.DEFAULT, SWT.DEFAULT);
- addButton_.addSelectionListener(new SelectionListener() {
-
- public void widgetSelected(SelectionEvent event) {
- handleAddButtonSelected(event);
- }
-
- public void widgetDefaultSelected(SelectionEvent event) {
- }
- });
-
- removeButton_ = uiUtils.createPushButton(buttonsComp, ConsumptionUIMessages.LABEL_BUTTON_REMOVE, null, null);
- GridData remGriddata = new GridData();
- Point remSize = removeButton_.computeSize(SWT.DEFAULT, SWT.DEFAULT);
- removeButton_.addSelectionListener(new SelectionListener() {
-
- public void widgetSelected(SelectionEvent event) {
- handleRemoveButtonSelected(event);
- }
-
- public void widgetDefaultSelected(SelectionEvent event) {
- }
- });
- enableRemove(false);
-
- // set the width to the max of the button labels
- int widthHint = 0;
- int[] sizes = new int[]{musize.x, mdsize.x, addSize.x, remSize.x, 100};
- for(int j = 0; j < sizes.length; j++) {
- if (sizes[j] > widthHint)
- widthHint = sizes[j];
- }
- muGriddata.widthHint = widthHint;
- mdGriddata.widthHint = widthHint;
- addGriddata.widthHint = widthHint;
- remGriddata.widthHint = widthHint;
-
- moveUpButton.setLayoutData(muGriddata);
- moveDownButton.setLayoutData(mdGriddata);
- addButton_.setLayoutData(addGriddata);
- removeButton_.setLayoutData(remGriddata);
-
- // table stuff
- String[] columns_ = new String[] { ConsumptionUIMessages.LABEL_HANDLER_NAME, ConsumptionUIMessages.LABLE_HANDLER_CLASS};
-
- final TableColumn[] tableCols = new TableColumn[columns_.length];
- for (int i = 0; i < columns_.length; i++) {
- TableColumn tableColumn = new TableColumn(handlersTable_, i);
- tableColumn.setText(columns_[i]);
- tableColumn.setAlignment(SWT.LEFT);
- tableColumn.setWidth(DEFAULT_COLUMN_WIDTH);
- tableColumn.setResizable(true);
- tableCols[i] = tableColumn;
- }
-
- handlersComp.addControlListener(new ControlAdapter() {
- public void controlResized(ControlEvent e) {
- Rectangle area = handlersComp.getClientArea();
- Point preferredSize = handlersTable_.computeSize(SWT.DEFAULT, SWT.DEFAULT);
- int width = area.width - 2*handlersTable_.getBorderWidth()-10;
- if (preferredSize.y > area.height + handlersTable_.getHeaderHeight()) {
- // Subtract the scrollbar width from the total column width
- // if a vertical scrollbar will be required
- Point vBarSize = handlersTable_.getVerticalBar().getSize();
- width -= vBarSize.x;
- }
- Point oldSize = handlersTable_.getSize();
- if (oldSize.x > area.width) {
- // table is getting smaller so make the columns
- // smaller first and then resize the table to
- // match the client area width
- tableCols[0].setWidth(width/2);
- tableCols[1].setWidth(width - tableCols[0].getWidth());
- handlersTable_.setSize(area.width, area.height);
- } else {
- // table is getting bigger so make the table
- // bigger first and then make the columns wider
- // to match the client area width
- handlersTable_.setSize(area.width, area.height);
- tableCols[0].setWidth(width/2);
- tableCols[1].setWidth(width - tableCols[0].getWidth());
- }
- }
- });
-
- tableViewer_ = new TableViewer(handlersTable_);
- Control control = tableViewer_.getControl();
-
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL;
- data.grabExcessHorizontalSpace = true;
- data.verticalAlignment = GridData.FILL;
- data.grabExcessVerticalSpace = true;
- control.setLayoutData(data);
-
- tableViewer_.setColumnProperties(columns_);
- tableViewer_.setContentProvider(new ListContentProvider());
- tableViewer_.setLabelProvider(new ListLabelProvider());
- tableViewer_.addSelectionChangedListener(new ISelectionChangedListener() {
-
- public void selectionChanged(SelectionChangedEvent event) {
- enableRemove(true);
- }
- });
-
- // gen skeleton check box
- genSkeletonRadioButton_ = uiUtils.createCheckbox(parent_, ConsumptionUIMessages.LABEL_BUTTON_GEN_SKELETON, ConsumptionUIMessages.TOOLTIP_BUTTON_GEN_SKELETON, INFOPOP_HDLR_GEN_SKELETON);
- genSkeletonRadioButton_.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent evt) {
- handleGenSkeletonRadioButton();
- }
- });
-
- // source location combo
- sourceLocationComp_ = uiUtils.createComposite(parent_, 2);
- sourceLocationCombo_ = uiUtils.createCombo(sourceLocationComp_, ConsumptionUIMessages.LABEL_COMBO_SOURCE_LOC, ConsumptionUIMessages.TOOLTIP_COMBO_SOURCE_LOC, INFOPOP_COMBO_SOURCE_LOC,
- SWT.READ_ONLY);
- sourceLocationCombo_.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent evt) {
- handleSourceLocationCombo(evt);
- }
- });
-
- return this;
- }
-
- // Called at start
- private void populateHandlersTable() {
- try {
- UIUtils uiUtils = new UIUtils(pluginId_);
-
- // process for multiple service selection
- if (isMultipleSelection_) {
- webServiceDescText_ = uiUtils.createText(webServiceRefComp_, ConsumptionUIMessages.LABEL_COMBO_WS_CLIENT_REF,
- ConsumptionUIMessages.TOOLTIP_WS_CLIENT_REF, INFOPOP_WS_CLIENT_REF, SWT.READ_ONLY);
- if (handlerServiceRefHolder_!=null){
- currentHSRH_ = handlerServiceRefHolder_[0];
- String text = NLS.bind(ConsumptionUIMessages.MSG_TEXT_NUM_OF_CLIENTS, Integer.toString(handlerServiceRefHolder_.length));
- webServiceDescText_.setText(text);
- }
-
- genSkeletonRadioButton_.setSelection(false);
- genSkeletonRadioButton_.setEnabled(false);
- genSkeletonRadioButton_.setVisible(false);
-
- sourceLocationComp_.setVisible(false);
- sourceLocationCombo_.setEnabled(false);
- sourceLocationCombo_.setVisible(false);
-
- refresh();
-
- }
- else {
-
- webServiceRefCombo_ = uiUtils.createCombo(webServiceRefComp_, ConsumptionUIMessages.LABEL_COMBO_WS_CLIENT_REF,
- ConsumptionUIMessages.TOOLTIP_WS_CLIENT_REF, INFOPOP_WS_CLIENT_REF, SWT.READ_ONLY);
- webServiceRefCombo_.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent evt) {
- handleWebServiceRefCombo(evt);
- }
- });
-
- String[] wsRefNames = HandlerServiceRefHelper.getAllServiceRefNames(handlerServiceRefHolder_);
- webServiceRefCombo_.setItems(wsRefNames);
-
- if (handlerServiceRefHolder_.length < 1) {
- webServiceRefCombo_.select(0);
- webServiceRefCombo_.setEnabled(false);
- }
- else {
- if (serviceRefName_ != null) {
- int index = webServiceRefCombo_.indexOf(serviceRefName_);
- if (index != -1) webServiceRefCombo_.select(index);
- }
- else
- webServiceRefCombo_.select(0);
- }
-
- // set handler table
- HandlerServiceRefHolder hsrh = HandlerServiceRefHelper.getForServiceRefName(handlerServiceRefHolder_, webServiceRefCombo_.getText());
- if (hsrh != null) {
- currentHSRH_ = hsrh;
- List handlers = hsrh.getHandlerList();
- tableViewer_.setInput(handlers);
- tableViewer_.refresh();
- }
-
- // set output folder
- setSourceOutputLocation();
- }
- parent_.getShell().setSize(530, 650);
- }
- catch (Exception e) {
- e.printStackTrace();
- }
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#getStatus()
- */
- public IStatus getStatus() {
- IStatus finalStatus = Status.OK_STATUS;
- if (isMultipleSelection_)
- return StatusUtils.infoStatus(ConsumptionUIMessages.PAGE_DESC_MULTIPLE_CLIENTS_CONFIG);
- return finalStatus;
- }
-
- protected void handleAddButtonSelected(SelectionEvent event) {
-
- AddHandlerDialog dialog = new AddHandlerDialog(parent_.getShell(), true);
- dialog.create();
- dialog.getShell().setSize( 500, 200 );
-
- int result = dialog.open();
-
- if (result == Window.OK) {
- String name = dialog.getName();
- String className = dialog.getClassName();
-
- HandlerTableItem hi = new HandlerTableItem();
- hi.setHandlerName(name);
- hi.setHandlerClassName(className);
-
- ServiceRef serviceRef = currentHSRH_.getServiceRef();
- hi.setWsDescRef(serviceRef);
- currentHSRH_.getHandlerList().add(hi);
- }
-
- refresh();
- }
-
- protected void handleRemoveButtonSelected(SelectionEvent event) {
- handleDeleteKeyPressed();
- }
-
- protected void handleMoveUpButtonSelected(SelectionEvent event) {
-
- int index = tableViewer_.getTable().getSelectionIndex();
- if (index != -1) {
- if (index > 0) {
- if (currentHSRH_!=null) {
- List handlers = currentHSRH_.getHandlerList();
- Object object = handlers.remove(index);
- handlers.add( index - 1, object);
- tableViewer_.refresh();
- }
- }
- }
-
- }
-
- protected void handleMoveDownButtonSelected(SelectionEvent event) {
-
- int index = tableViewer_.getTable().getSelectionIndex();
- if (index != -1) {
- if (currentHSRH_!=null){
- List handlers = currentHSRH_.getHandlerList();
- if (index < handlers.size() - 1) {
- Object object = handlers.remove(index);
- handlers.add(index + 1, object);
- tableViewer_.refresh();
- }
- }
- }
-
- }
-
- protected void handleSourceLocationCombo(SelectionEvent event) {
- outputLocation_ = sourceLocationCombo_.getText();
- IPath outputPath = (IPath) pathsTable_.get(outputLocation_);
- currentHSRH_.setSourceOutputPath(outputPath);
- }
-
- protected void handleGenSkeletonRadioButton() {
- if (genSkeletonRadioButton_.isEnabled()) {
- if (genSkeletonRadioButton_.getSelection()) {
- this.isGenSkeletonEnabled_ = true;
- sourceLocationCombo_.setEnabled(true);
- }
- else {
- this.isGenSkeletonEnabled_ = false;
- sourceLocationCombo_.setEnabled(false);
- }
- }
- }
-
- protected void handleWebServiceRefCombo(SelectionEvent event) {
-
- if (webServiceRefCombo_!=null && webServiceRefCombo_.isEnabled()) {
- HandlerServiceRefHolder hsrh = HandlerServiceRefHelper.getForServiceRefName(handlerServiceRefHolder_, webServiceRefCombo_.getText());
- currentHSRH_ = hsrh;
- refresh();
- }
-
- if (isGenSkeletonEnabled_){
- setSourceOutputLocation();
- }
-
- }
-
- /**
- * @return Returns the isGenSkeletonEnabled_.
- */
- public boolean isGenSkeletonEnabled_() {
- return isGenSkeletonEnabled_;
- }
-
- protected class ListLabelProvider extends LabelProvider implements ITableLabelProvider {
-
- public Image getColumnImage(Object element, int columnIndex) {
- return null;
- }
-
- public String getColumnText(Object object, int columnIndex) {
-
- if (object instanceof HandlerTableItem) {
- HandlerTableItem hti = (HandlerTableItem) object;
- if (columnIndex == 0) {
-
- return hti.getHandlerName() != null ? hti.getHandlerName() : "";
- }
- else if (columnIndex == 1) { return hti.getHandlerClassName() != null ? hti.getHandlerClassName() : ""; }
- }
- return null;
- }
-
- }
-
- private void enableRemove(boolean enabled) {
- removeButton_.setEnabled(enabled && !tableViewer_.getSelection().isEmpty());
- }
-
- protected class ListContentProvider implements IStructuredContentProvider {
-
- public Object[] getElements(Object element) {
- if (element instanceof Vector) { return ((Vector) element).toArray(); }
- return null;
- }
-
- public void dispose() {
- }
-
- public void inputChanged(Viewer viewer, Object old, Object newobj) {
- }
-
- public boolean isDeleted(Object object) {
- return false;
- }
- }
-
- protected void handleDeleteKeyPressed() {
- ISelection selection = tableViewer_.getSelection();
- if (selection != null && !selection.isEmpty() && (selection instanceof IStructuredSelection)) {
- int selectionIndex = handlersTable_.getSelectionIndex();
- if (currentHSRH_!=null){
- currentHSRH_.getHandlerList().remove(selectionIndex);
- }
- refresh();
- }
- }
-
- public void refresh() {
-
- try {
- tableViewer_.setInput(null);
- if (currentHSRH_!=null){
- List handlers = currentHSRH_.getHandlerList();
- tableViewer_.setInput(handlers);
- tableViewer_.refresh();
- }
- }
- catch (Exception e) {
- e.printStackTrace();
- }
-
- }
-
- public void setGenSkeletonEnabled(boolean isGenSkeletonEnabled) {
- this.isGenSkeletonEnabled_ = isGenSkeletonEnabled;
- genSkeletonRadioButton_.setSelection(isGenSkeletonEnabled);
-
- }
-
- public boolean getGenSkeletonEnabled() {
- return this.isGenSkeletonEnabled_;
- }
-
- private void setSourceOutputLocation(){
- if (currentHSRH_!=null){
- IProject project = currentHSRH_.getProject();
- if (project!=null){
- IPath[]locations = ResourceUtils.getAllJavaSourceLocations(project);
- String[] paths = new String[locations.length];
- for (int i = 0; i < locations.length; i++) {
- paths[i] = locations[i].toString();
- pathsTable_.put(paths[i], locations[i]);
- }
- sourceLocationCombo_.setItems(paths);
- sourceLocationCombo_.select(0);
- }
-
- // set in model
- outputLocation_ = sourceLocationCombo_.getText();
- IPath outputPath = (IPath) pathsTable_.get(outputLocation_);
- currentHSRH_.setSourceOutputPath(outputPath);
- }
- }
-
- /**
- * Called at the beginning
- */
- public void internalize(){
- populateHandlersTable();
- }
-
- /**
- * Initial selection
- * @param wsRefName
- */
- public void setServiceRefName(String wsRefName) {
- serviceRefName_ = wsRefName;
- }
-
- /**
- * true if multiple clients are selected
- * @param isMulitpleSelection
- */
- public void setIsMultipleSelection(boolean isMulitpleSelection) {
- this.isMultipleSelection_ = isMulitpleSelection;
- }
-
- /**
- * An array of HandlerDescriptionHolders
- * @return
- */
- public void setHandlerServiceRefHolder(HandlerServiceRefHolder[] handlerHolders){
- this.handlerServiceRefHolder_ = handlerHolders;
- }
-
- public HandlerServiceRefHolder[] getHandlerServiceRefHolder(){
- return this.handlerServiceRefHolder_;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigServiceHandlersTableWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigServiceHandlersTableWidget.java
deleted file mode 100644
index 37b15ea..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigServiceHandlersTableWidget.java
+++ /dev/null
@@ -1,685 +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
- * -------- -------- -----------------------------------------------------------
- * 20060404 134913 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060426 135614 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060529 143518 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.common.HandlerDescriptionHelper;
-import org.eclipse.jst.ws.internal.consumption.ui.common.HandlerDescriptionHolder;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-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.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Text;
-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;
-
-/**
- * ConfigServiceHandlersTreeWidget
- *
- */
-public class ConfigServiceHandlersTableWidget extends SimpleWidgetDataContributor {
-
- private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-
- private Composite parent_;
- private Table handlersTable_;
- private TableViewer tableViewer_;
- private Composite webServiceDescComp_;
- private Combo webServiceDescCombo_ = null;
- private Text webServiceDescText_ = null;
- private Button addButton_;
- private Button removeButton_;
- private Button genSkeletonRadioButton_;
- private Composite sourceLocationComp_;
- private Combo sourceLocationCombo_;
-
- private HandlerDescriptionHolder[] handlerDescriptionHolder_;
- private HandlerDescriptionHolder currentHDH_;
- private Hashtable pathsTable_ = new Hashtable(); // available paths for combo
- private String outputLocation_; // selected path from combo
- private String descriptionName_ = null;
- private boolean isMultipleSelection_ = false;
- private boolean isGenSkeletonEnabled_;
-
- private int DEFAULT_COLUMN_WIDTH = 100;
-
- // ----TOOLTIPS Section----
- /* CONTEXT_ID SHLD0001 for the Handler Config Page */
- private final String INFOPOP_HDLR_WS_HANDLERS = "SHDL0001"; //$NON-NLS-1$
-
- /* CONTEXT_ID SHDL0002 for the Handler Config Page */
- private final String INFOPOP_HDLR_GEN_SKELETON = "SHDL0002"; //$NON-NLS-1$
-
- /* CONTEXT_ID SHDL0003 for the Handler Config Page */
- private final String INFOPOP_COMBO_SOURCE_LOC = "SHDL0003"; //$NON-NLS-1$
-
- /* CONTEXT_ID SHDL0004 for the Handler Config Page */
- private final String INFOPOP_WS_SERVICE_DESC = "SHDL0004"; //$NON-NLS-1$
-
- // ------------------------
-
- public ConfigServiceHandlersTableWidget() {
- super();
- }
-
- public WidgetDataEvents addControls(Composite parent, Listener statusListener) {
- UIUtils uiUtils = new UIUtils(pluginId_);
-
- parent_ = parent;
-
- // Web service description composite (combo/text to be created later)
- webServiceDescComp_ = uiUtils.createComposite(parent_, 2);
-
- Composite displayComp = new Composite(parent_, SWT.NONE);
-
- GridLayout gridlayout = new GridLayout(2, false);
- displayComp.setLayout(gridlayout);
- displayComp.setLayoutData(uiUtils.createFillAll());
-
- final Composite handlersComp = uiUtils.createComposite(displayComp, 1);
- GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING
- | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_VERTICAL | GridData.FILL_VERTICAL);
- handlersComp.setLayoutData(griddata);
- handlersComp.setSize(130, 600);
-
- Composite buttonsComp = uiUtils.createComposite(displayComp, 1);
- griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
- buttonsComp.setLayoutData(griddata);
-
- Text handlersText = new Text(handlersComp, SWT.READ_ONLY);
- handlersText.setText(ConsumptionUIMessages.LABEL_HANDLERS_CONFIG);
- GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.horizontalSpan = 2;
- handlersText.setLayoutData(gd);
-
- handlersTable_ = uiUtils.createTable(handlersComp, ConsumptionUIMessages.TOOLTIP_EDIT_WS_HANDLERS, INFOPOP_HDLR_WS_HANDLERS, SWT.MULTI
- | SWT.FULL_SELECTION | SWT.BORDER);
- handlersTable_.setHeaderVisible(true);
- handlersTable_.setLinesVisible(true);
-
- // empty space
- Label wsLabel = new Label(buttonsComp, SWT.NONE);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.horizontalSpan = 2;
- wsLabel.setLayoutData(gd);
-
- Button moveUpButton = uiUtils.createPushButton(buttonsComp, ConsumptionUIMessages.LABEL_BUTTON_MOVE_UP, null, null);
- GridData muGriddata = new GridData();
- Point musize = moveUpButton.computeSize(SWT.DEFAULT, SWT.DEFAULT);
- moveUpButton.addSelectionListener(new SelectionListener() {
-
- public void widgetSelected(SelectionEvent event) {
- handleMoveUpButtonSelected(event);
- }
-
- public void widgetDefaultSelected(SelectionEvent event) {
- }
- });
-
- Button moveDownButton = uiUtils.createPushButton(buttonsComp, ConsumptionUIMessages.LABEL_BUTTON_MOVE_DOWN, null, null);
- GridData mdGriddata = new GridData();
- Point mdsize = moveDownButton.computeSize(SWT.DEFAULT, SWT.DEFAULT);
- moveDownButton.addSelectionListener(new SelectionListener() {
-
- public void widgetSelected(SelectionEvent event) {
- handleMoveDownButtonSelected(event);
- }
-
- public void widgetDefaultSelected(SelectionEvent event) {
- }
- });
-
- // empty space
- wsLabel = new Label(buttonsComp, SWT.NONE);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.horizontalSpan = 2;
- wsLabel.setLayoutData(gd);
-
- addButton_ = uiUtils.createPushButton(buttonsComp, ConsumptionUIMessages.LABEL_BUTTON_ADD, null, null);
- GridData addGriddata = new GridData();
- Point addSize = addButton_.computeSize(SWT.DEFAULT, SWT.DEFAULT);
- addButton_.addSelectionListener(new SelectionListener() {
-
- public void widgetSelected(SelectionEvent event) {
- handleAddButtonSelected(event);
- }
-
- public void widgetDefaultSelected(SelectionEvent event) {
- }
- });
-
- removeButton_ = uiUtils.createPushButton(buttonsComp, ConsumptionUIMessages.LABEL_BUTTON_REMOVE, null, null);
- GridData remGriddata = new GridData();
- Point remSize = removeButton_.computeSize(SWT.DEFAULT, SWT.DEFAULT);
- removeButton_.addSelectionListener(new SelectionListener() {
-
- public void widgetSelected(SelectionEvent event) {
- handleRemoveButtonSelected(event);
- }
-
- public void widgetDefaultSelected(SelectionEvent event) {
- }
- });
- enableRemove(false);
-
- int widthHint = 0;
- int[] sizes = new int[]{musize.x, mdsize.x, addSize.x, remSize.x, 100};
- for(int j = 0; j < sizes.length; j++) {
- if (sizes[j] > widthHint)
- widthHint = sizes[j];
- }
- muGriddata.widthHint = widthHint;
- mdGriddata.widthHint = widthHint;
- addGriddata.widthHint = widthHint;
- remGriddata.widthHint = widthHint;
-
- moveUpButton.setLayoutData(muGriddata);
- moveDownButton.setLayoutData(mdGriddata);
- addButton_.setLayoutData(addGriddata);
- removeButton_.setLayoutData(remGriddata);
-
- // table stuff here
- String[] columns_ = new String[] { ConsumptionUIMessages.LABEL_HANDLER_NAME, ConsumptionUIMessages.LABLE_HANDLER_CLASS,
- ConsumptionUIMessages.LABEL_HANDLER_PORT};
-
- final TableColumn[] tableCols = new TableColumn[columns_.length];
- for (int i = 0; i < columns_.length; i++) {
- TableColumn tableColumn = new TableColumn(handlersTable_, SWT.LEFT);
- tableColumn.setText(columns_[i]);
- tableColumn.setAlignment(SWT.LEFT);
- tableColumn.setWidth(DEFAULT_COLUMN_WIDTH);
- tableColumn.setResizable(true);
- tableCols[i] = tableColumn;
- }
- handlersComp.addControlListener(new ControlAdapter() {
-
- public void controlResized(ControlEvent e) {
- Rectangle area = handlersComp.getClientArea();
- Point preferredSize = handlersTable_.computeSize(SWT.DEFAULT, SWT.DEFAULT);
- int width = area.width - 2 * handlersTable_.getBorderWidth() - 10;
- if (preferredSize.y > area.height + handlersTable_.getHeaderHeight()) {
- // Subtract the scrollbar width from the total column width
- // if a vertical scrollbar will be required
- Point vBarSize = handlersTable_.getVerticalBar().getSize();
- width -= vBarSize.x;
- }
- Point oldSize = handlersTable_.getSize();
- if (oldSize.x > area.width) {
- // table is getting smaller so make the columns
- // smaller first and then resize the table to
- // match the client area width
- tableCols[0].setWidth(width / 3);
- tableCols[1].setWidth(width / 3);
- tableCols[2].setWidth(width - (tableCols[0].getWidth() + tableCols[1].getWidth()));
- handlersTable_.setSize(area.width, area.height);
- }
- else {
- // table is getting bigger so make the table
- // bigger first and then make the columns wider
- // to match the client area width
- handlersTable_.setSize(area.width, area.height);
- tableCols[0].setWidth(width / 3);
- tableCols[1].setWidth(width / 3);
- tableCols[2].setWidth(width - (tableCols[0].getWidth() + tableCols[1].getWidth()));
- }
- }
- });
-
- tableViewer_ = new TableViewer(handlersTable_);
- Control control = tableViewer_.getControl();
-
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL;
- data.grabExcessHorizontalSpace = true;
- data.verticalAlignment = GridData.FILL;
- data.grabExcessVerticalSpace = true;
- control.setLayoutData(data);
-
- tableViewer_.setColumnProperties(columns_);
- tableViewer_.setContentProvider(new ListContentProvider());
- tableViewer_.setLabelProvider(new ListLabelProvider());
- tableViewer_.addSelectionChangedListener(new ISelectionChangedListener() {
-
- public void selectionChanged(SelectionChangedEvent event) {
- enableRemove(true);
- }
- });
-
- genSkeletonRadioButton_ = uiUtils.createCheckbox(parent_, ConsumptionUIMessages.LABEL_BUTTON_GEN_SKELETON,
- ConsumptionUIMessages.TOOLTIP_BUTTON_GEN_SKELETON, INFOPOP_HDLR_GEN_SKELETON);
- griddata = new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL);
- genSkeletonRadioButton_.setLayoutData(griddata);
- genSkeletonRadioButton_.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent evt) {
- handleGenSkeletonRadioButton();
- }
- });
-
- sourceLocationComp_ = uiUtils.createComposite(parent_, 2);
- sourceLocationCombo_ = uiUtils.createCombo(sourceLocationComp_, ConsumptionUIMessages.LABEL_COMBO_SOURCE_LOC,
- ConsumptionUIMessages.TOOLTIP_COMBO_SOURCE_LOC, INFOPOP_COMBO_SOURCE_LOC, SWT.READ_ONLY);
- sourceLocationCombo_.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent evt) {
- handleSourceLocationCombo(evt);
- }
- });
-
- return this;
- }
-
- // Called at start and only for single service selection
- private void populateHandlersTable() {
- try {
- UIUtils uiUtils = new UIUtils(pluginId_);
-
- // process for multiple service selection
- if (isMultipleSelection_) {
- parent_.getShell().setText(ConsumptionUIMessages.PAGE_DESC_MULTIPLE_SERVICES_CONFIG);
-
- webServiceDescText_ = uiUtils.createText(webServiceDescComp_, ConsumptionUIMessages.LABEL_COMBO_WS_SERVICE_DESC,
- ConsumptionUIMessages.TOOLTIP_WS_SERVICE_DESC, INFOPOP_WS_SERVICE_DESC, SWT.READ_ONLY);
- if (handlerDescriptionHolder_!=null){
- currentHDH_ = handlerDescriptionHolder_[0];
- String text = NLS.bind(ConsumptionUIMessages.MSG_TEXT_NUM_OF_SERVICES, Integer.toString(handlerDescriptionHolder_.length));
- webServiceDescText_.setText(text);
- }
-
- genSkeletonRadioButton_.setSelection(false);
- genSkeletonRadioButton_.setEnabled(false);
- genSkeletonRadioButton_.setVisible(false);
-
- sourceLocationComp_.setVisible(false);
- sourceLocationCombo_.setEnabled(false);
- sourceLocationCombo_.setVisible(false);
-
- refresh();
-
- }
- else {
- // populate the table for a single service selection
-
- webServiceDescCombo_ = uiUtils.createCombo(webServiceDescComp_, ConsumptionUIMessages.LABEL_COMBO_WS_SERVICE_DESC,
- ConsumptionUIMessages.TOOLTIP_WS_SERVICE_DESC, INFOPOP_WS_SERVICE_DESC, SWT.READ_ONLY);
- webServiceDescCombo_.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent evt) {
- handleWebServiceDescCombo(evt);
- }
- });
-
- String[] wsDescNames = HandlerDescriptionHelper.getAllDescriptionNames(handlerDescriptionHolder_);
- webServiceDescCombo_.setItems(wsDescNames);
-
- if (handlerDescriptionHolder_.length < 1) {
- webServiceDescCombo_.select(0);
- webServiceDescCombo_.setEnabled(false);
- }
- else {
- if (descriptionName_ != null) {
- int index = webServiceDescCombo_.indexOf(descriptionName_);
- if (index != -1) webServiceDescCombo_.select(index);
- }
- else
- webServiceDescCombo_.select(0);
- }
-
- // set Descriptions
- HandlerDescriptionHolder hdh = HandlerDescriptionHelper.getForDescriptionName(handlerDescriptionHolder_, webServiceDescCombo_.getText());
- if (hdh!=null){
- currentHDH_ = hdh;
- List handlers = hdh.getHandlerList();
- tableViewer_.setInput(handlers);
- tableViewer_.refresh();
- }
- // set output folder
- setSourceOutputLocation();
- }
- parent_.getShell().setSize(530, 650);
- }
- catch (Exception e) {
- e.printStackTrace();
- }
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#getStatus()
- */
- public IStatus getStatus() {
- IStatus finalStatus = Status.OK_STATUS;
- if (isMultipleSelection_)
- return StatusUtils.infoStatus(ConsumptionUIMessages.PAGE_DESC_MULTIPLE_SERVICES_CONFIG);
- return finalStatus;
- }
-
- protected void handleAddButtonSelected(SelectionEvent event) {
- AddHandlerDialog dialog = new AddHandlerDialog(parent_.getShell(), false);
- dialog.setIsMultipleServices(isMultipleSelection_);
- dialog.create();
-
- WebServiceDescription serviceDesc = null;
- if (!isMultipleSelection_ ){
- if (currentHDH_!=null) {
- serviceDesc = currentHDH_.getDescriptionObject();
- String[] portNames = getPortComponentNames(serviceDesc);
- dialog.setPortNames(portNames);
- }
- }
-
- dialog.getShell().setSize(500, 230);
-
- int result = dialog.open();
-
- if (result == Window.OK) {
- String name = dialog.getName();
- String className = dialog.getClassName();
- String port = dialog.getPortName();
- if (port == null)
- port = "*";
-
- HandlerTableItem hi = new HandlerTableItem();
- hi.setHandlerName(name);
- hi.setHandlerClassName(className);
- hi.setPortName(port);
-
- if (serviceDesc!=null){
- hi.setWsDescRef(serviceDesc);
- }
-
- if (currentHDH_!=null){
- List handlers = currentHDH_.getHandlerList();
- handlers.add(hi);
- }
-
- }
-
- refresh();
- }
-
- private String[] getPortComponentNames(WebServiceDescription webServiceDesc) {
-
- List ports = webServiceDesc.getPortComponents();
- if (ports != null) {
- String[] portNames = new String[ports.size()];
- for (int i = 0; i < ports.size(); i++) {
- PortComponent pc = (PortComponent) ports.get(i);
- String pcName = pc.getPortComponentName();
- portNames[i] = pcName;
- }
- return portNames;
- }
- return new String[0];
- }
-
- protected void handleRemoveButtonSelected(SelectionEvent event) {
- handleDeleteKeyPressed();
- }
-
- protected void handleMoveUpButtonSelected(SelectionEvent event) {
-
- int index = tableViewer_.getTable().getSelectionIndex();
- if (index != -1) {
- if (index > 0) {
- if (currentHDH_!=null){
- List handlers = currentHDH_.getHandlerList();
- Object object = handlers.remove(index);
- handlers.add(index - 1, object);
- }
- tableViewer_.refresh();
- }
- }
-
- }
-
- protected void handleMoveDownButtonSelected(SelectionEvent event) {
-
- int index = tableViewer_.getTable().getSelectionIndex();
- if (index != -1) {
- if (currentHDH_!=null){
- List handlers = currentHDH_.getHandlerList();
- if (index < handlers.size() - 1) {
- Object object = handlers.remove(index);
- handlers.add(index+1, object);
- }
- tableViewer_.refresh();
- }
- }
-
- }
-
- protected void handleSourceLocationCombo(SelectionEvent event) {
- outputLocation_ = sourceLocationCombo_.getText();
- IPath outputPath = (IPath) pathsTable_.get(outputLocation_);
- currentHDH_.setSourceOutputPath(outputPath);
- }
-
- protected void handleGenSkeletonRadioButton() {
- if (genSkeletonRadioButton_.isEnabled()) {
- if (genSkeletonRadioButton_.getSelection()) {
- this.isGenSkeletonEnabled_ = true;
- sourceLocationCombo_.setEnabled(true);
- }
- else {
- this.isGenSkeletonEnabled_ = false;
- sourceLocationCombo_.setEnabled(false);
- }
- }
- }
-
- protected void handleWebServiceDescCombo(SelectionEvent event) {
-
- if (webServiceDescCombo_!=null && webServiceDescCombo_.isEnabled()) {
- HandlerDescriptionHolder hdh = HandlerDescriptionHelper.getForDescriptionName(handlerDescriptionHolder_, webServiceDescCombo_.getText());
- currentHDH_ = hdh;
- refresh();
- }
-
- if (isGenSkeletonEnabled_){
- setSourceOutputLocation();
- }
-
- }
-
- /**
- * @return Returns the isGenSkeletonEnabled_.
- */
- public boolean isGenSkeletonEnabled_() {
- return isGenSkeletonEnabled_;
- }
-
- protected class ListLabelProvider extends LabelProvider implements ITableLabelProvider {
-
- public Image getColumnImage(Object element, int columnIndex) {
- return null;
- }
-
- public String getColumnText(Object object, int columnIndex) {
-
- if (object instanceof HandlerTableItem) {
- HandlerTableItem hti = (HandlerTableItem) object;
- if (columnIndex == 0) {
- return hti.getHandlerName() != null ? hti.getHandlerName() : "";
- }
- else if (columnIndex == 1) {
- return hti.getHandlerClassName() != null ? hti.getHandlerClassName() : "";
- }
- else {
- return hti.getPortName() != null ? hti.getPortName() : "";
- }
- }
- return null;
- }
-
- }
-
- private void enableRemove(boolean enabled) {
- removeButton_.setEnabled(enabled && !tableViewer_.getSelection().isEmpty());
- }
-
- protected class ListContentProvider implements IStructuredContentProvider {
-
- public Object[] getElements(Object element) {
- if (element instanceof Vector) { return ((Vector) element).toArray(); }
- return null;
- }
-
- public void dispose() {
- }
-
- public void inputChanged(Viewer viewer, Object old, Object newobj) {
- }
-
- public boolean isDeleted(Object object) {
- return false;
- }
- }
-
- protected void handleDeleteKeyPressed() {
- // internalDispose();
- ISelection selection = tableViewer_.getSelection();
- if (selection != null && !selection.isEmpty() && (selection instanceof IStructuredSelection)) {
- int selectionIndex = handlersTable_.getSelectionIndex();
- if (currentHDH_!=null){
- currentHDH_.getHandlerList().remove(selectionIndex);
- }
- refresh();
- }
- }
-
- public void refresh() {
- try {
- tableViewer_.setInput(null);
- if (currentHDH_!=null){
- List handlers = currentHDH_.getHandlerList();
- tableViewer_.setInput(handlers);
- tableViewer_.refresh();
- }
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- public void setGenSkeletonEnabled(boolean isGenSkeletonEnabled) {
- this.isGenSkeletonEnabled_ = isGenSkeletonEnabled;
- genSkeletonRadioButton_.setSelection(isGenSkeletonEnabled);
-
- }
-
- public boolean getGenSkeletonEnabled() {
- return this.isGenSkeletonEnabled_;
- }
-
- private void setSourceOutputLocation(){
- IProject project = currentHDH_.getProject();
- if (project!=null){
- IPath[] locations = ResourceUtils.getAllJavaSourceLocations(project);
-
- String[] paths = new String[locations.length];
- for (int i = 0; i < locations.length; i++) {
- paths[i] = locations[i].toString();
- pathsTable_.put(paths[i], locations[i]);
- }
- sourceLocationCombo_.setItems(paths);
- sourceLocationCombo_.select(0);
- }
-
- // set in model
- outputLocation_ = sourceLocationCombo_.getText();
- IPath outputPath = (IPath) pathsTable_.get(outputLocation_);
- currentHDH_.setSourceOutputPath(outputPath);
-
- }
-
- /**
- * An array of HandlerDescriptionHolders
- * @return
- */
- public void setHandlerDescriptionHolders(HandlerDescriptionHolder[] handlerHolders){
- this.handlerDescriptionHolder_ = handlerHolders;
- }
-
- public HandlerDescriptionHolder[] getHandlerDescriptionHolders(){
- return this.handlerDescriptionHolder_;
- }
-
- /**
- * For getting the handlers to apply for multiple services
- * @return
- */
- public List getHandlersList(){
- if (handlerDescriptionHolder_[0]!=null)
- return handlerDescriptionHolder_[0].getHandlerList();
- return null;
- }
-
- public void setDescriptionName(String wsDescName) {
- descriptionName_ = wsDescName;
- }
-
- public void setIsMultipleSelection(boolean isMulitpleSelection) {
- this.isMultipleSelection_ = isMulitpleSelection;
- }
-
- public void internalize(){
- populateHandlersTable();
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/HandlersDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/HandlersDefaultingCommand.java
deleted file mode 100644
index 44a2129..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/HandlersDefaultingCommand.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.consumption.ui.widgets;
-
-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.j2ee.internal.webservice.WebServiceNavigatorGroupType;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-
-
-/**
- * HandlersDefaultingCommand
- *
- * Determine if Handlers belongs to service or client side
- */
-public class HandlersDefaultingCommand extends AbstractHandlersWidgetDefaultingCmd
-{
- private boolean isClientHandler_ = false;
- private boolean isServiceHandler_ = false;
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
- IStatus status = Status.OK_STATUS;
-
- IStructuredSelection selection = getInitialSelection();
- if (selection != null && selection.size() == 1) {
- Object obj = selection.getFirstElement();
-
- if (obj instanceof WebServiceNavigatorGroupType) {
- WebServiceNavigatorGroupType wsngt = (WebServiceNavigatorGroupType) obj;
- if (wsngt.getWsdlService()!=null){
- isServiceHandler_ = true;
- }
-
- if (wsngt.getServiceRef()!=null){
- isClientHandler_ = true;
- }
-
- }
- }
- else {
- status = StatusUtils.errorStatus( ConsumptionUIMessages.MSG_ERROR_TASK_EXCEPTED );
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- return status;
-
- }
-
-
-/**
- * @return Returns the isClientHandler_.
- */
-public boolean getIsClientHandler() {
- return isClientHandler_;
-}
-/**
- * @return Returns the isServiceHandler_.
- */
-public boolean getIsServiceHandler() {
- return isServiceHandler_;
-}
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/IObjectSelectionLaunchable.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/IObjectSelectionLaunchable.java
deleted file mode 100644
index c59ad6d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/IObjectSelectionLaunchable.java
+++ /dev/null
@@ -1,93 +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
- * -------- -------- -----------------------------------------------------------
- * 20060420 135912 joan@ca.ibm.com - Joan Haggarty
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.widgets.Shell;
-
-public interface IObjectSelectionLaunchable {
- /**
- * The framework will call this method to set the initial selection
- * value that the user has specified.
- *
- * @param initialSelection the initial selection the user specified.
- */
- public void setInitialSelection(IStructuredSelection initialSelection);
-
- /**
- * The intent of the Object Selection Widget is that the user has
- * the opportunity change/find the object that they want to turn into
- * a Web service.
- *
- * @return returns the an IStructuredSelection object that the user
- * want to turn into a Web service. This object may be different than
- * the initialSelection passed in by the setInitialSelection method.
- */
- public IStructuredSelection getObjectSelection();
-
- /**
- * Validates whether the objectSelection parameter is valid for
- * this Object selection widget. An error status should be returned
- * if this object is not value. Otherwise, and ok status should be
- * returned
- *
- * @param objectSelection the object to be validated.
- * @return the status of the validation.
- */
- public IStatus validateSelection(IStructuredSelection objectSelection);
-
- /**
- *
- * @return returns the IProject that contains the selection
- * object that the user has chosen with this widget. The value can be
- * null if there is no IProject for this object.
- */
- public IProject getProject();
-
- /**
- *
- * @return returns the name of the IVirtualComponent that contains the selection
- * object that the user has chosen with this widget. The value can be
- * null if there is no IVirtualComponent for this object
- */
- public String getComponentName();
-
- /**
- * Called to launch a dialog which allows the user to make an object selection.
- * This is an alternative to implementing IObjectSelectionWidget which can be used by the dialog framework.
- * The implementation of this method should call the necessary getters on the dialog to update the
- * object selection.
- *
- * @return the status of completing the dialog launch
- */
- public int launch(Shell shell);
-
- /**
- *
- * @return returns the string to displayed in the UI for the selected object
- */
- public String getObjectSelectionDisplayableString();
-
- /**
- *
- * @param s A string representation of the object selection
- * @return true if the string represents a valid object selection.
- * The implementation of this method should set the widget object selection
- * according to the input string so that a subsequent call to getObjectSelection
- * will retrieve the correct object.
- */
- public boolean validate(String s);
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/IPackable.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/IPackable.java
deleted file mode 100644
index 5600bd9..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/IPackable.java
+++ /dev/null
@@ -1,26 +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
- * -------- -------- -----------------------------------------------------------
- * 20060829 155441 makandre@ca.ibm.com - Andrew Mak, web service wizard hangs during resize
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-/**
- * An interface that marks an UI element as having some custom packing code.
- */
-public interface IPackable {
-
- /**
- * Calling this method should cause the UI element to pack itself. Note that
- * this does not necessarily have the same behavior as the pack() method in SWT.
- */
- void packIt();
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ImportWSILWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ImportWSILWidget.java
deleted file mode 100644
index 6c7b19d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ImportWSILWidget.java
+++ /dev/null
@@ -1,234 +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
- * -------- -------- -----------------------------------------------------------
- * 20080501 229728 makandre@ca.ibm.com - Andrew Mak, uppercase .WSDL cannot be found by the Web Service Client wizard
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import java.net.MalformedURLException;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.ws.internal.common.J2EEActionAdapterFactory;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.wsil.Arguments;
-import org.eclipse.jst.ws.internal.consumption.ui.wsil.TableViewerEditor;
-import org.eclipse.jst.ws.internal.ui.common.DialogResourceBrowser;
-import org.eclipse.jst.ws.internal.ui.common.FileExtensionFilter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-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.ui.help.IWorkbenchHelpSystem;
-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;
-import org.eclipse.wst.ws.internal.wsil.AddWSDLToWSILCommand;
-import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-/**
-* Page for importing WSDL references into a WSIL in the workbench.
-*/
-public class ImportWSILWidget extends SimpleWidgetDataContributor
-{
- /*CONTEXT_ID WSIL0001 for the WSIL Import Page*/
- private final String INFOPOP_WSIL_IMPORT_PAGE = WebServiceConsumptionUIPlugin.ID + ".WSIL0001";
-
- /*CONTEXT_ID WSIL0002 for the WSIL text field*/
- private final String INFOPOP_WSIL_TEXT_WSIL = WebServiceConsumptionUIPlugin.ID + ".WSIL0002";
-
- /*CONTEXT_ID WSIL0003 for the WSIL browse button*/
- private final String INFOPOP_WSIL_BUTTON_BROWSE_WSIL = WebServiceConsumptionUIPlugin.ID + ".WSIL0003";
-
- /*CONTEXT_ID WSIL0004 for the WSDL table*/
- private final String INFOPOP_WSIL_TABLE_WSDL = WebServiceConsumptionUIPlugin.ID + ".WSIL0004";
-
- private final String INSPECTION_WSIL = "inspection.wsil";
-
- private Text wsil_;
- private Button browse_;
- private TableViewerEditor wsdls_;
-
- /**
- * Constructs a new page.
- */
- public ImportWSILWidget()
- {
- }
-
- public WidgetDataEvents addControls(Composite parent, Listener statusListener)
- {
- IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
-
- parent.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSIL_IMPORT_PAGE);
- helpSystem.setHelp(parent, INFOPOP_WSIL_IMPORT_PAGE);
-
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout gl = new GridLayout();
- gl.numColumns = 3;
- composite.setLayout(gl);
- GridData gd = new GridData(GridData.GRAB_VERTICAL | GridData.VERTICAL_ALIGN_BEGINNING | GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL);
- gd.grabExcessVerticalSpace = true;
- gd.grabExcessHorizontalSpace = true;
- composite.setLayoutData(gd);
-
- Label label = new Label(composite, SWT.WRAP);
- label.setText(ConsumptionUIMessages.LABEL_WSIL_URI);
- label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
- wsil_ = new Text(composite, SWT.WRAP | SWT.SINGLE | SWT.BORDER);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
- gd.widthHint = 256;
- wsil_.setLayoutData(gd);
- wsil_.addListener(SWT.Modify, statusListener);
- wsil_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSIL_TEXT_WSIL);
- helpSystem.setHelp(wsil_, INFOPOP_WSIL_TEXT_WSIL);
-
- browse_ = new Button(composite, SWT.PUSH);
- browse_.setText(ConsumptionUIMessages.LABEL_BROWSE);
- browse_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- browse_.addListener(SWT.Selection,
- new Listener()
- {
- public void handleEvent(Event event)
- {
- handleBrowseEvent(event);
- }
- }
- );
- browse_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSIL_BUTTON_BROWSE_WSIL);
- helpSystem.setHelp(browse_, INFOPOP_WSIL_BUTTON_BROWSE_WSIL);
-
- Composite wsdlComposite = new Composite(composite, SWT.NONE);
- wsdlComposite.setLayout(new GridLayout());
- gd = new GridData(GridData.FILL_BOTH);
- gd.horizontalSpan = 3;
- wsdlComposite.setLayoutData(gd);
- label = new Label(wsdlComposite, SWT.WRAP);
- label.setText(ConsumptionUIMessages.LABEL_WSDL);
- label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- String[] columns = {ConsumptionUIMessages.LABEL_WSDL_URI};
- wsdls_ = new TableViewerEditor(wsdlComposite, columns, new ArrayList(), "http://");
- wsdls_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSIL_TABLE_WSDL);
- wsdls_.setInfopop(INFOPOP_WSIL_TABLE_WSDL);
- return this;
- }
-
- public void handleBrowseEvent(Event event)
- {
- DialogResourceBrowser dialog = new DialogResourceBrowser(browse_.getShell(), null, new FileExtensionFilter(new String[] {"wsil"}));
- dialog.open();
- IResource res = dialog.getFirstSelection();
- if (res != null)
- {
- if (res instanceof IFile)
- wsil_.setText(res.getFullPath().toString());
- else
- wsil_.setText(res.getFullPath().addTrailingSeparator().append(INSPECTION_WSIL).toString());
- }
- }
-
- public IStatus getStatus()
- {
- if (!wsil_.getText().toLowerCase().endsWith(".wsil"))
- return StatusUtils.errorStatus( ConsumptionUIMessages.PAGE_MSG_INVALID_WSIL_FILE_NAME );
- else
- return Status.OK_STATUS;
- }
-
- public void setInitialSelection(IStructuredSelection selection)
- {
- ArrayList list = new ArrayList();
- if (selection != null && !selection.isEmpty())
- {
- for (Iterator it = selection.iterator(); it.hasNext();)
- {
- Object object = it.next();
- if (object instanceof IFile) {
- IFile file = (IFile) object;
- String ext = file.getFileExtension();
- if (ext != null) {
- if (ext.equalsIgnoreCase("wsdl"))
- list.add(file.getFullPath().toString());
- else if (ext.equalsIgnoreCase("wsil"))
- wsil_.setText(file.getFullPath().toString());
- }
- }
- if (object instanceof ServiceImpl)
- list.add(J2EEActionAdapterFactory.getWSILPath(((ServiceImpl)(object))));
- if (object instanceof ServiceRef)
- list.add(J2EEActionAdapterFactory.getWSILPath(((ServiceRef)(object))));
- if (object instanceof WSDLResourceImpl)
- list.add(J2EEActionAdapterFactory.getWSILPath(((WSDLResourceImpl)(object))));
- }
- }
- wsdls_.setInput(list);
- wsdls_.refresh();
- if (list.size() > 0)
- {
- StringBuffer path = new StringBuffer(list.get(0).toString());
- // change extension from .wsdl to .wsil
- int length = path.length();
- path = path.replace(length-4, length, "wsil");
- wsil_.setText(path.toString());
- }
- }
-
- public Arguments getGenWSILArguments()
- {
- Arguments args = new Arguments();
- String wsilPath = wsil_.getText();
- if (wsilPath.indexOf(':') < 0)
- args.add(AddWSDLToWSILCommand.ARG_WSIL, URI.createPlatformResourceURI(wsil_.getText()).toString());
- else
- args.add(AddWSDLToWSILCommand.ARG_WSIL, wsilPath);
- TableItem[] items = wsdls_.getItems();
- for (int i = 0; i < items.length; i++)
- {
- String uri = items[i].getText(0);
- if (uri.indexOf(':') < 0)
- {
- IResource res = ResourceUtils.findResource(uri);
- if (res != null)
- {
- try
- {
- uri = res.getLocation().toFile().toURL().toString();
- }
- catch (MalformedURLException murle)
- {
- murle.getMessage();
- }
- }
- }
- args.add(AddWSDLToWSILCommand.ARG_WSDL, uri);
- }
- args.add(AddWSDLToWSILCommand.ARG_RESOLVE_WSDL, null);
- return args;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/JavaBeanSelectionLaunchable.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/JavaBeanSelectionLaunchable.java
deleted file mode 100644
index 8b36f4d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/JavaBeanSelectionLaunchable.java
+++ /dev/null
@@ -1,215 +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
- * -------- -------- -----------------------------------------------------------
- * 20060420 135912 joan@ca.ibm.com - Joan Haggarty
- * 20060719 149352 mahutch@ca.ibm.com - Mark Hutchinson
- * 20060826 135570 makandre@ca.ibm.com - Andrew Mak, Service implementation URL not displayed properly on first page
- * 20070313 170126 makandre@ca.ibm.com - Andrew Mak, BUJava scenario doesn't catch improper service definition
- * 20080310 222075 makandre@ca.ibm.com - Andrew Mak, Cannot launch Web Service wizard on an IType
- * 20080318 213330 trungha@ca.ibm.com - Trung, Non-conventional Java naming prevents creating Web Services (client)
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaConventions;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.webservice.wsdd.BeanLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.PortComponentImpl;
-import org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.ServiceImplBeanImpl;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.ui.dialog.DialogUtils;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class JavaBeanSelectionLaunchable extends AbstractObjectSelectionLaunchable {
-
- private IProject serverProject_ = null;
- private String serverComponentName_ = null;
- private String beanClassString_="";
- private IStatus validationStatus;
-
- public void setInitialSelection(IStructuredSelection initialSelection)
- {
- if (initialSelection != null && !initialSelection.isEmpty())
- {
- Object object = initialSelection.getFirstElement();
- if (object instanceof IFile)
- {
- IFile iFile = (IFile)object;
- String fileExt = iFile.getFileExtension().toLowerCase();
- if (fileExt.equals("java") || fileExt.equals("class"))
- setBeanClass(iFile);
- }
- else if (object instanceof IType)
- setBeanClass((IType) object);
- else if (object instanceof ICompilationUnit)
- setBeanClass(((ICompilationUnit)object).getResource());
- else if (object instanceof ServiceImplBeanImpl)
- setBeanClass((ServiceImplBeanImpl)object);
- else if(object instanceof BeanLink)
- setBeanClass((BeanLink)object);
- else if (object instanceof String)
- beanClassString_ = (String) object; // use for displayable string
- }
- }
-
- public IStructuredSelection getObjectSelection()
- {
- return new StructuredSelection(beanClassString_);
- }
-
- public IProject getProject()
- {
- return serverProject_;
- }
-
- public String getComponentName()
- {
- return serverComponentName_;
- }
-
- public int launch(Shell shell) {
-
- IType itype = DialogUtils.browseClassesAsIType(shell, ResourcesPlugin.getWorkspace().getRoot().getProjects(), new ProgressMonitorDialog(shell));
- return setBeanClass(itype);
- }
-
- private int setBeanClass(IType itype) {
- if (itype != null)
- {
- beanClassString_ = itype.getFullyQualifiedName();
- try
- {
- IResource res = itype.getUnderlyingResource();
- if (res != null)
- {
- serverProject_ = res.getProject();
- IVirtualComponent comp = ResourceUtils.getComponentOf(res);
- if (comp!=null)
- {
- serverComponentName_ = comp.getName();
- }
- }
- else
- {
- serverProject_ = null;
- serverComponentName_ = null;
- }
- return Status.OK;
- }
- catch (JavaModelException jme)
- {
- serverProject_ = null;
- serverComponentName_ = null;
- return Status.ERROR;
- }
- }
- return Status.CANCEL;
- }
-
- private void setBeanClass(IResource resource)
- {
- if( resource != null && resource instanceof IFile )
- {
- IPath path = resource.getFullPath();
- String basename = path.lastSegment();
-
- if( basename != null && basename.length() > 0 )
- {
- String beanPackage = org.eclipse.jst.ws.internal.common.ResourceUtils.getJavaResourcePackageName(path);
- String beanClass = (beanPackage == null || beanPackage.length() == 0 ? basename : (beanPackage + "." + basename));
-
- if( beanClass.toLowerCase().endsWith(".java") || beanClass.toLowerCase().endsWith(".class" ) )
- {
- beanClass = beanClass.substring( 0, beanClass.lastIndexOf('.') );
- }
-
- beanClassString_ = beanClass;
- serverProject_ = ResourceUtils.getProjectOf(path);
- IVirtualComponent comp = ResourceUtils.getComponentOf(resource);
-
- if (comp!=null)
- {
- serverComponentName_ = comp.getName();
- }
-
- }
- }
- }
-
- private void setBeanClass(ServiceImplBeanImpl serviceImpl)
- {
- if( serviceImpl != null )
- {
- EObject eObject = serviceImpl.eContainer();
- if(eObject instanceof PortComponentImpl){
- PortComponentImpl pci = (PortComponentImpl)eObject;
- beanClassString_ = pci.getServiceEndpointInterface();
- }
- }
- }
-
- private void setBeanClass(BeanLink serviceImpl)
- {
- if( serviceImpl != null )
- {
- EObject eObject = serviceImpl.eContainer();
- if(eObject instanceof ServiceImplBeanImpl){
- setBeanClass((ServiceImplBeanImpl)eObject);
- }
- }
- }
-
- public IStatus getStatus()
- {
- if (beanClassString_.length() <= 0)
- {
- return StatusUtils.errorStatus(ConsumptionUIMessages.PAGE_MSG_BEAN_CANNOT_BE_EMPTY);
- }
- return Status.OK_STATUS;
- }
-
- public IStatus validateSelection(IStructuredSelection objectSelection)
- {
- if (validationStatus == null)
- return Status.OK_STATUS;
-
- return validationStatus;
- }
-
- public String getObjectSelectionDisplayableString() {
- return beanClassString_;
- }
-
- public boolean validate(String s) {
- beanClassString_ = s;
- String sourceLevel = JavaCore.getOption(JavaCore.COMPILER_SOURCE);
- String complianceLevel = JavaCore.getOption(JavaCore.COMPILER_COMPLIANCE);
- validationStatus = JavaConventions.validateJavaTypeName(s, sourceLevel, complianceLevel);
- return validationStatus.isOK();
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PreferencesSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PreferencesSelectionWidget.java
deleted file mode 100644
index 82c4649..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PreferencesSelectionWidget.java
+++ /dev/null
@@ -1,81 +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.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.ui.WSUIPluginMessages;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-
-public class PreferencesSelectionWidget extends SimpleWidgetDataContributor
-{
- private ResourceContext context_;
-
- /*CONTEXT_ID PWPR0003 for the Overwrite Files check box of the Project Page*/
- private String INFOPOP_PWPR_CHECKBOX_OVERWRITE_FILES = "PWPR0003";
- private Button overwriteFilesCheckbox_;
-
- /*CONTEXT_ID PWPR0004 for the Create Folders check box of the Project Page*/
- private String INFOPOP_PWPR_CHECKBOX_CREATE_FOLDERS = "PWPR0004";
- private Button createFoldersCheckbox_;
-
- /*CONTEXT_ID PWPR0015 for the Check Out Files check box of the Project Page*/
- private String INFOPOP_PWPR_CHECKBOX_CHECKOUT_FILES = "PWPR0015";
- private Button checkoutFilesCheckbox_;
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#addControls(org.eclipse.swt.widgets.Composite, org.eclipse.swt.widgets.Listener)
- */
- public WidgetDataEvents addControls( Composite parent, Listener statusListener)
- {
- String conPluginId = "org.eclipse.jst.ws.consumption.ui";
- UIUtils utils = new UIUtils( conPluginId );
-
- Composite resourcesGroup = utils.createComposite( parent, 1 );
-
- overwriteFilesCheckbox_ = utils.createCheckbox( resourcesGroup, WSUIPluginMessages.BUTTON_OVERWRITE_FILES,
- WSUIPluginMessages.TOOLTIP_PPRM_CHECKBOX_OVERWRITE_FILES,
- INFOPOP_PWPR_CHECKBOX_OVERWRITE_FILES );
-
- createFoldersCheckbox_ = utils.createCheckbox( resourcesGroup, WSUIPluginMessages.BUTTON_CREATE_FOLDERS,
- WSUIPluginMessages.TOOLTIP_PPRM_CHECKBOX_CREATE_FOLDERS ,
- INFOPOP_PWPR_CHECKBOX_CREATE_FOLDERS );
-
- checkoutFilesCheckbox_ = utils.createCheckbox( resourcesGroup, WSUIPluginMessages.BUTTON_CHECKOUT_FILES,
- WSUIPluginMessages.TOOLTIP_PPRM_CHECKBOX_CHECK_OUT,
- INFOPOP_PWPR_CHECKBOX_CHECKOUT_FILES );
-
- return this;
- }
-
- public void setResourceContext( ResourceContext context )
- {
- overwriteFilesCheckbox_.setSelection( context.isOverwriteFilesEnabled() );
- createFoldersCheckbox_.setSelection( context.isCreateFoldersEnabled() );
- checkoutFilesCheckbox_.setSelection( context.isCheckoutFilesEnabled() );
-
- context_ = context;
- }
-
- public ResourceContext getResourceContext()
- {
- context_.setOverwriteFilesEnabled( overwriteFilesCheckbox_.getSelection() );
- context_.setCreateFoldersEnabled( createFoldersCheckbox_.getSelection() );
- context_.setCheckoutFilesEnabled( checkoutFilesCheckbox_.getSelection() );
-
- return context_;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ProjectSelectionDialog.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ProjectSelectionDialog.java
deleted file mode 100644
index bb43ca1..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ProjectSelectionDialog.java
+++ /dev/null
@@ -1,123 +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
- * -------- -------- -----------------------------------------------------------
- * 20060413 135581 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060802 148731 mahutch@ca.ibm.com - Mark Hutchinson
- * 20080603 234251 pmoogk@ca.ibm.com - Peter Moogk, Updated the size of project selection dialog
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ProjectSelectionWidget;
-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.PageInfo;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleDialog;
-
-public class ProjectSelectionDialog extends SimpleDialog {
-
- String titleText_="";
- String projectName_="";
- String earProjectName_="";
- String componentType_="";
- TypeRuntimeServer trs_;
- boolean needEAR_;
-
- public ProjectSelectionDialog(Shell shell, PageInfo pageInfo)
- {
- super(shell, pageInfo);
- titleText_ = pageInfo.getPageName();
- }
-
- protected void callSetters() {
- // TODO Auto-generated method stub
- ProjectSelectionWidget projWidget = (ProjectSelectionWidget)getWidget();
- projWidget.setEarProjectName(earProjectName_);
- projWidget.setProjectName(projectName_);
- projWidget.setComponentType(componentType_);
- projWidget.setNeedEAR(needEAR_);
- projWidget.setTypeRuntimeServer(trs_);
-
- projWidget.refreshProjectItems();
- }
-
- protected Point getInitialSize()
- {
- return this.getShell().computeSize(325, SWT.DEFAULT, true);
- }
-
-
- protected void setShellStyle(int newShellStyle)
- {
- super.setShellStyle( newShellStyle | SWT.RESIZE );
- }
-
- protected void configureShell(Shell newShell)
- {
- newShell.setText(titleText_);
- super.configureShell(newShell);
- }
-
- public void setProjectName(String name)
- {
- projectName_ = name;
- }
-
- public String getProjectName()
- {
- return projectName_;
- }
-
- public void setEarProjectName(String name)
- {
- earProjectName_ = name;
- }
-
- public String getEarProjectName()
- {
- return earProjectName_;
- }
-
- public void setProjectComponentType( String type )
- {
- componentType_ = type;
- }
-
- public String getProjectComponentType()
- {
- return componentType_;
- }
-
- public void setNeedEAR(boolean b)
- {
- needEAR_ = b;
- }
-
- public boolean getNeedEAR()
- {
- return needEAR_;
- }
-
- public void setTypeRuntimeServer(TypeRuntimeServer trs)
- {
- trs_ = trs;
- }
-
- public boolean close() {
-
- projectName_ = ((ProjectSelectionWidget)getWidget()).getProjectName();
- earProjectName_ = ((ProjectSelectionWidget)getWidget()).getEarProjectName();
- needEAR_ = ((ProjectSelectionWidget)getWidget()).getNeedEAR();
- componentType_ = ((ProjectSelectionWidget)getWidget()).getComponentType();
- return super.close();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishToPrivateUDDICommandFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishToPrivateUDDICommandFragment.java
deleted file mode 100644
index f81138e..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishToPrivateUDDICommandFragment.java
+++ /dev/null
@@ -1,101 +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.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.PrivateUDDIRegistryTypeRegistry;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.AbstractCommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-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 PublishToPrivateUDDICommandFragment extends AbstractCommandFragment
-{
- private DataMappingRegistry dataMappingRegistry;
- private CanFinishRegistry canFinishRegistry;
- private WidgetRegistry widgetRegistry;
- private boolean publishToPrivateUDDI;
- private CommandWidgetBinding privateUDDIBinding;
-
- public PublishToPrivateUDDICommandFragment()
- {
- super(null, "");
- privateUDDIBinding = PrivateUDDIRegistryTypeRegistry.getInstance().getPrivateUDDIRegistryType().getBinding();
- }
-
- /**
- * Gets the first child fragment for this fragment.
- *
- * @return returns the first child fragment for this fragment. Returns
- * null when there is no first child.
- **/
- public CommandFragment getFirstSubFragment()
- {
- if (privateUDDIBinding != null && publishToPrivateUDDI && !PrivateUDDIRegistryTypeRegistry.getInstance().getPrivateUDDIRegistryType().isPrivateUDDIRegistryInstalled())
- {
- privateUDDIBinding.registerCanFinish(canFinishRegistry);
- privateUDDIBinding.registerDataMappings(dataMappingRegistry);
- privateUDDIBinding.registerWidgetMappings(widgetRegistry);
- return privateUDDIBinding.create().create();
- }
- else
- return null;
- }
-
- /**
- * Gets the next child fragment for this fragment.
- *
- * @return returns the next child fragment for this fragment. Returns null
- * when there is no next child.
- **/
- public CommandFragment getNextSubFragment(CommandFragment fragment)
- {
- return null;
- }
-
- /*
- * This method is called to retrieve the data mappings for this command fragment.
- */
- public void registerDataMappings(DataMappingRegistry registry)
- {
- dataMappingRegistry = registry;
- }
-
- public void registerCanFinish(CanFinishRegistry canFinishRegistry)
- {
- this.canFinishRegistry = canFinishRegistry;
- }
-
- public void registerWidgetMappings(WidgetRegistry widgetRegistry)
- {
- this.widgetRegistry = widgetRegistry;
- }
-
- /**
- * All wizard fragments need to be cloneable.
- **/
- public Object clone()
- {
- PublishToPrivateUDDICommandFragment fragment = new PublishToPrivateUDDICommandFragment();
- fragment.registerDataMappings(dataMappingRegistry);
- fragment.registerCanFinish(canFinishRegistry);
- fragment.registerWidgetMappings(widgetRegistry);
- fragment.setPublishToPrivateUDDI(publishToPrivateUDDI);
- return fragment;
- }
-
- public void setPublishToPrivateUDDI(boolean publish)
- {
- publishToPrivateUDDI = publish;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishWSWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishWSWidget.java
deleted file mode 100644
index 5b74d45..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishWSWidget.java
+++ /dev/null
@@ -1,152 +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
- * -------- -------- -----------------------------------------------------------
- * 20080430 214624 makandre@ca.ibm.com - Andrew Mak, Remove favourite UDDI registries from Web Service Publish page
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.PrivateUDDIRegistryTypeRegistry;
-import org.eclipse.jst.ws.internal.ui.uddi.PrivateUDDIRegistryType;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.help.IWorkbenchHelpSystem;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.ws.internal.explorer.LaunchOption;
-import org.eclipse.wst.ws.internal.explorer.LaunchOptions;
-
-
-public class PublishWSWidget extends SimpleWidgetDataContributor
-{
- /* CONTEXT_ID PWPB0001 for the UDDI Publish Page */
- private String INFOPOP_PWPB_PAGE = WebServiceConsumptionUIPlugin.ID + ".PWPB0001";
- /* CONTEXT_ID PWPB0002 for the UDDI Launch check box of the UDDI Publish Page */
- private String INFOPOP_PWPB_CHECKBOX_WS_LAUNCH = WebServiceConsumptionUIPlugin.ID + ".PWPB0002";
- private Button launchUDDICheckbox_;
- private Button launchPrivateUDDICheckbox_;
- private Listener statusListener;
- private Boolean publish;
-
- public PublishWSWidget(boolean publish)
- {
- this.publish = new Boolean(publish);
- }
-
- public WidgetDataEvents addControls(Composite parent, Listener statusListener)
- {
- this.statusListener = statusListener;
- Listener selListener = new Listener()
- {
- public void handleEvent(Event event)
- {
- handleSelectionEvent(event);
- }
- };
- parent.setToolTipText(ConsumptionUIMessages.TOOLTIP_PWPB_PAGE);
- IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
- helpSystem.setHelp(parent, INFOPOP_PWPB_PAGE);
- launchPrivateUDDICheckbox_ = new Button(parent, SWT.CHECK);
- if (publish.booleanValue())
- launchPrivateUDDICheckbox_.setText(ConsumptionUIMessages.BUTTON_WS_PUBLISH_PRIVATE_UDDI);
- else
- launchPrivateUDDICheckbox_.setText(ConsumptionUIMessages.BUTTON_WS_FIND_PRIVATE_UDDI);
- launchPrivateUDDICheckbox_.setToolTipText(ConsumptionUIMessages.TOOLTIP_PWPB_CHECKBOX_WS_LAUNCH);
- launchPrivateUDDICheckbox_.addListener(SWT.Selection, selListener);
- helpSystem.setHelp(launchPrivateUDDICheckbox_, INFOPOP_PWPB_CHECKBOX_WS_LAUNCH);
- launchUDDICheckbox_ = new Button(parent, SWT.CHECK);
- if (publish.booleanValue())
- launchUDDICheckbox_.setText(ConsumptionUIMessages.BUTTON_WS_PUBLISH);
- else
- launchUDDICheckbox_.setText(ConsumptionUIMessages.BUTTON_WS_FIND);
- launchUDDICheckbox_.setToolTipText(ConsumptionUIMessages.TOOLTIP_PWPB_CHECKBOX_WS_LAUNCH);
- launchUDDICheckbox_.addListener(SWT.Selection, selListener);
- helpSystem.setHelp(launchUDDICheckbox_, INFOPOP_PWPB_CHECKBOX_WS_LAUNCH);
- initPrivateUDDI();
- return this;
- }
-
- private void initPrivateUDDI()
- {
- if (!publish.booleanValue() && !PrivateUDDIRegistryTypeRegistry.getInstance().getPrivateUDDIRegistryType().isPrivateUDDIRegistryInstalled())
- launchPrivateUDDICheckbox_.setEnabled(false);
- }
-
- private void handleSelectionEvent(Event event)
- {
- statusListener.handleEvent(event);
- }
-
- public void setPublishToPublicUDDI(boolean publish)
- {
- launchUDDICheckbox_.setSelection(publish);
- }
-
- public void setPublishToPublicUDDI(Boolean publish)
- {
- setPublishToPublicUDDI(publish.booleanValue());
- }
-
- public void setPublishToPrivateUDDI(boolean publish)
- {
- launchPrivateUDDICheckbox_.setSelection(publish);
- }
-
- public void setPublishToPrivateUDDI(Boolean publish)
- {
- setPublishToPrivateUDDI(publish.booleanValue());
- }
-
- public boolean getPublishToPublicUDDI()
- {
- return launchUDDICheckbox_.getSelection();
- }
-
- public boolean getPublishToPrivateUDDI()
- {
- return launchPrivateUDDICheckbox_.getSelection();
- }
-
- public boolean getForceLaunchOutsideIDE()
- {
- return false;
- }
-
- public LaunchOption[] getLaunchOptions()
- {
- Vector launchOptionVector = new Vector();
- if (launchUDDICheckbox_.getSelection())
- {
- launchOptionVector.add(new LaunchOption(LaunchOptions.INQUIRY_URL, ""));
- launchOptionVector.add(new LaunchOption(LaunchOptions.PUBLISH_URL, ""));
- }
- if (launchPrivateUDDICheckbox_.getSelection())
- {
- PrivateUDDIRegistryTypeRegistry privateReg = PrivateUDDIRegistryTypeRegistry.getInstance();
- PrivateUDDIRegistryType privateType = privateReg.getPrivateUDDIRegistryType();
- String[] privateInquiryURL = privateType.getPrivateUDDIRegistryInquiryAPI();
- String[] privatePublishURL = privateType.getPrivateUDDIRegistryPublishAPI();
- for (int i = 0; i < privateInquiryURL.length; i++)
- {
- launchOptionVector.add(new LaunchOption(LaunchOptions.INQUIRY_URL, privateInquiryURL[i]));
- launchOptionVector.add(new LaunchOption(LaunchOptions.PUBLISH_URL, privatePublishURL[i]));
- }
- }
- return (LaunchOption[]) launchOptionVector.toArray(new LaunchOption[0]);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetDefaultingCommand.java
deleted file mode 100644
index 7d8020a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,376 +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
- * -------- -------- -----------------------------------------------------------
- * 20060404 134913 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060517 142027 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060518 142554 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-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.Status;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroupType;
-import org.eclipse.jst.j2ee.webservice.wsdd.Handler;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServices;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddResource;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.common.HandlerDescriptionHolder;
-import org.eclipse.jst.ws.internal.consumption.ui.helper.WebServicesManager;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-/**
- * ServiceHandlersWidgetDefaultingCommand
- *
- * Initialize and load the handlers data
- */
-public class ServiceHandlersWidgetDefaultingCommand extends AbstractHandlersWidgetDefaultingCmd {
-
- private WsddResource[] wsddResource_ = null;
- private IProject project_;
- private String descriptionName_ = null;
- private String errorStatusMsg_ = null;
- private boolean isMultipleSelection_;
- private HandlerDescriptionHolder[] handlerDescriptionHolder_;
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
- IStatus status = Status.OK_STATUS;
-
- IStructuredSelection selection = getInitialSelection();
- if (selection == null) {
- status = StatusUtils.errorStatus( ConsumptionUIMessages.MSG_ERROR_TASK_EXCEPTED );
- env.getStatusHandler().reportError(status);
- return status;
- }
- else if (selection.size()>1){
- status = processMultipleHandlers(env);
- return status;
- }
-
- status = processHandlers(env);
- return status;
-
- }
-
- public IStatus processHandlers(IEnvironment env) {
- try {
- WebServicesManager webServicesManager = new WebServicesManager();
- List allWSDLServices = webServicesManager.getAllWSDLServices();
- int servicesSize = allWSDLServices.size();
-
- wsddResource_= new WsddResource[servicesSize];
- wsddResource_[0] = getWsddResourceFromSelection();
- if (wsddResource_[0] == null) {
- return StatusUtils.errorStatus(ConsumptionUIMessages.MSG_ERROR_WSDD_NOT_FOUND);
- }
-
- // check for another wsddResource of another J2EE level
- int x = 0;
- while (x<servicesSize) {
- Service service = (Service )allWSDLServices.get(x);
- WsddResource wsddRes = webServicesManager.getWsddResource(service);
- boolean isUniqueWsdd = true;
- for (int w=0;w<wsddResource_.length;w++){
- if (wsddRes.equals(wsddResource_[w])){
- isUniqueWsdd = false;
- break;
- }
- }
-
- if (isUniqueWsdd) {
- wsddResource_[x] = wsddRes;
- }
- x++;
- }
-
- // determine total # for descriptions
- handlerDescriptionHolder_ = new HandlerDescriptionHolder[getNumberofServices(wsddResource_)];
-
- int descCounter = 0;
- for (int y=0;y<wsddResource_.length;y++) {
- if (wsddResource_[y] !=null) {
- WebServices webServices = wsddResource_[y].getWebServices();
- if (webServices != null) {
- List wsDescriptions = webServices.getWebServiceDescriptions();
- for (int i = 0; i < wsDescriptions.size() ; i++) {
-
- WebServiceDescription wsDescription = (WebServiceDescription) wsDescriptions.get(i);
- Vector handlers = new Vector();
- List wsPortComponents = wsDescription.getPortComponents();
- for (int j = 0; j < wsPortComponents.size(); j++) {
- PortComponent wsPort = (PortComponent) wsPortComponents.get(j);
- String portName = wsPort.getPortComponentName();
- List wsHandlers = wsPort.getHandlers();
-
- for (int k = 0; k < wsHandlers.size(); k++) {
-
- Handler wsHandler = (Handler) wsHandlers.get(k);
-
- HandlerTableItem handlerItem = new HandlerTableItem();
- handlerItem.setHandler(wsHandler);
- handlerItem.setHandlerName(wsHandler.getHandlerName());
- handlerItem.setHandlerClassName(wsHandler.getHandlerClass());
- handlerItem.setPort(wsPort);
- handlerItem.setPortName(portName);
- handlerItem.setWsDescRef(wsDescription);
-
- handlers.add(handlerItem);
- }
- }
- String wsDescName = wsDescription.getWebServiceDescriptionName();
- handlerDescriptionHolder_[descCounter] = new HandlerDescriptionHolder();
- handlerDescriptionHolder_[descCounter].setHandlerList(handlers);
- handlerDescriptionHolder_[descCounter].setDescriptionObject(wsDescription);
- handlerDescriptionHolder_[descCounter].setDescriptionName(wsDescName);
- descCounter++;
- }
- }
- }
- }
-
- if (handlerDescriptionHolder_ == null){
- //report no Web service is available
- return StatusUtils.errorStatus(ConsumptionUIMessages.MSG_ERROR_WEB_SERVICES_NOT_FOUND);
- }
- }
- catch (Exception e) {
- e.printStackTrace();
- return StatusUtils.errorStatus( ConsumptionUIMessages.MSG_ERROR_TASK_EXCEPTED, e);
- }
- return Status.OK_STATUS;
- }
-
- /**
- * For processing multiple service selection; only prepare table of service description names
- * description objects will be processed later by the output command
- * @param env
- * @return
- */
- private IStatus processMultipleHandlers(IEnvironment env){
-
- Service[] services = getSelectedServices();
- if (errorStatusMsg_ != null){
- return StatusUtils.errorStatus(errorStatusMsg_);
- }
- isMultipleSelection_ = true;
-
- handlerDescriptionHolder_ = new HandlerDescriptionHolder[services.length];
- Vector handlers = new Vector();
- for (int i=0;i<services.length;i++){
-
- String descName = services[i].getQName().getLocalPart();
- WebServiceDescription wsDescription = getServiceDescription(services[i], descName);
- handlerDescriptionHolder_[i] = new HandlerDescriptionHolder();
- handlerDescriptionHolder_[i].setHandlerList(handlers);
- handlerDescriptionHolder_[i].setDescriptionName(descName);
- handlerDescriptionHolder_[i].setDescriptionObject(wsDescription);
- }
- return Status.OK_STATUS;
- }
-
- /**
- * Matches the serviceName with the ServiceDescriptionName to get the WebServiceDescription
- * @param service
- * @param serviceName
- * @return
- */
- private WebServiceDescription getServiceDescription(Service service, String serviceName){
- WebServicesManager webServicesManager = new WebServicesManager();
- WsddResource wsddResource = webServicesManager.getWsddResource(service);
- if (wsddResource!=null) {
- WebServices services = wsddResource.getWebServices();
- if (services!=null) {
- List descriptions = services.getWebServiceDescriptions();
- for (int i=0;i<descriptions.size();i++){
- WebServiceDescription wsd = (WebServiceDescription)descriptions.get(i);
- if (wsd!=null && wsd.getWebServiceDescriptionName().equals(serviceName)){
- return wsd;
- }
- }
- }
- }
- return null;
- }
-
- public boolean getIsMultipleSelection(){
- return this.isMultipleSelection_;
- }
-
- /**
- * @return Returns the isGenSkeletonEnabled_.
- */
- public boolean getGenSkeletonEnabled() {
- if (isMultipleSelection_)
- return false;
- return true;
- }
-
- /**
- * @return Returns the sourceOutputLocation_.
- */
- public IPath[] getSourceOutputLocation() {
- IPath[] locations = null;
- IProject project = getProject();
-
- if (project != null) {
- locations = ResourceUtils.getAllJavaSourceLocations(project);
- }
- else {
- project = project_;
- if (project != null) {
- locations = ResourceUtils.getAllJavaSourceLocations(project);
- }
- }
- return locations;
- }
-
- /**
- * Gets the WsddResource
- * @return
- */
- public WsddResource[] getWsddResource() {
- return wsddResource_;
- }
-
- private WsddResource getWsddResourceFromSelection() {
- WebServicesManager webServicesManager = new WebServicesManager();
-
- IStructuredSelection initSel = getInitialSelection();
- if (initSel != null && initSel.size() == 1) {
- Object obj = initSel.getFirstElement();
- if (obj instanceof ServiceImpl) {
- // Service object
- Service service = (Service) obj;
- descriptionName_ = service.getQName().getLocalPart();
- project_ = ProjectUtilities.getProject(service);
- return webServicesManager.getWsddResource(service);
- }
- else if (obj instanceof WSDLResourceImpl) {
- // WSDL resource
- WSDLResourceImpl res = (WSDLResourceImpl) obj;
- project_ = ProjectUtilities.getProject(res);
- List wsdlResources = webServicesManager.getWSDLServices(res);
- return webServicesManager.getWsddResource((Service) wsdlResources.get(0));
- }
- else if (obj instanceof WebServiceNavigatorGroupType) {
- WebServiceNavigatorGroupType wsngt = (WebServiceNavigatorGroupType) obj;
- Service service = (Service)wsngt.getWsdlService();
- descriptionName_ = service.getQName().getLocalPart();
- project_ = ProjectUtilities.getProject(service);
- return webServicesManager.getWsddResource(service);
- }
- else if (obj instanceof IFile){
- // webservices.xml file
- Resource res = WorkbenchResourceHelperBase.getResource((IFile)obj, true);
- WsddResource wsddRes = (WsddResource)res;
- WebServices webServices = wsddRes.getWebServices();
- if (webServices != null) {
- List wsDescriptions = webServices.getWebServiceDescriptions();
- if (wsDescriptions!=null) {
- WebServiceDescription wsd = (WebServiceDescription)wsDescriptions.get(0);
- descriptionName_ = wsd.getWebServiceDescriptionName();
- }
- }
- project_ = ProjectUtilities.getProject(res);
- return wsddRes;
- }
- }
-
- return null;
-
- }
-
- /**
- * Get total number of ServiceDescriptions given 14 and 13 services
- * @param wsddRes
- * @return
- */
- private int getNumberofServices(WsddResource[] wsddRes){
- int num= 0;
- for (int i=0;i<wsddRes.length;i++){
- if (wsddRes[i]!=null) {
- WebServices ws = wsddRes[i].getWebServices();
- if (ws!=null){
- num += ws.getWebServiceDescriptions().size();
- }
- }
- }
- return num;
-
- }
-
- /**
- * For multiple selection of Services
- * @return
- */
- private Service[] getSelectedServices(){
- WebServicesManager wsManager = new WebServicesManager();
- IStructuredSelection initSel = getInitialSelection();
- Service[] services = new Service[initSel.size()];
- wsddResource_ = new WsddResource[initSel.size()];
- Iterator iter = initSel.iterator();
- for (int i=0;i<initSel.size();i++) {
- Object obj = iter.next();
- if (obj instanceof Service){
- services[i] = (Service)obj;
- wsddResource_[i] = wsManager.getWsddResource(services[i]);
- }
- else{
- errorStatusMsg_ = ConsumptionUIMessages.MSG_ERROR_INVALID_MULTIPLE_SERVICE_SELECT;
- return null;
- }
- }
- return services;
- }
-
-
-
- /**
- * Get Description Name for single Web services selected
- * null if mulitple services are selected
- * @return
- */
- public String getDescriptionName(){
- return descriptionName_;
- }
-
- /**
- * An array of HandlerDescriptionHolders
- * @return
- */
- public HandlerDescriptionHolder[] getHandlerDescriptionHolders(){
- return handlerDescriptionHolder_;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetOutputCommand.java
deleted file mode 100644
index 9ef8c60..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetOutputCommand.java
+++ /dev/null
@@ -1,244 +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
- * -------- -------- -----------------------------------------------------------
- * 20060404 134913 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060517 142027 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.List;
-
-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.webservice.wsdd.Handler;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddResource;
-import org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddFactoryImpl;
-import org.eclipse.jst.ws.internal.consumption.ui.common.HandlerDescriptionHelper;
-import org.eclipse.jst.ws.internal.consumption.ui.common.HandlerDescriptionHolder;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.internal.emf.utilities.EtoolsCopyUtility;
-
-/*
- * Provide a way to externalize the edited fields and create new handlers
- *
- */
-public class ServiceHandlersWidgetOutputCommand extends AbstractDataModelOperation
-{
-
- private WsddResource[] wsddResource_;
- private boolean isMultipleSelection_;
- private HandlerDescriptionHolder[] handlerDescriptionHolder_;
-
- /**
- * For each HandlerDescriptionHolder, the user selected Handlers are
- * sync'd up with the internal model
- * For multiple services, handlers are added (not removed) to each port.
- *
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IStatus status = Status.OK_STATUS;
- try {
- if (isMultipleSelection_){
- for (int i=0; i<handlerDescriptionHolder_.length;i++){
-
- handlerDescriptionHolder_[i].addHandlerToAllPorts();
- }
- }
- else {
- // add handler(s) for single service selected
- for (int h=0;h<handlerDescriptionHolder_.length;h++){
-
- Hashtable wsPortsTable = new Hashtable();
- Hashtable wsPortToHandlerTable = new Hashtable();
-
- String serviceDescName = handlerDescriptionHolder_[h].getDescriptionName();
- // load PortName -> PortComponent table
- HandlerDescriptionHolder hdh = HandlerDescriptionHelper.getForDescriptionName(handlerDescriptionHolder_, serviceDescName);
- if (hdh!=null) {
-
- WebServiceDescription wsDescription_ = hdh.getDescriptionObject();
- if (wsDescription_ != null) {
- List wsPorts = wsDescription_.getPortComponents();
- for (int k = 0; k < wsPorts.size(); k++) {
- PortComponent port = (PortComponent) wsPorts.get(k);
- wsPortsTable.put(port.getPortComponentName(), port);
- wsPortToHandlerTable.put(port.getPortComponentName(), new ArrayList());
- }
- }
-
- List handlerTableItems = hdh.getHandlerList();
- if (handlerTableItems != null) {
-
- WsddFactory wsddFactory = new WsddFactoryImpl();
-
- //form port components tables first
- for (int i = 0; i < handlerTableItems.size(); i++) {
-
- HandlerTableItem hti = (HandlerTableItem) handlerTableItems.get(i);
- PortComponent wsPort = (PortComponent) hti.getPort();
- if (wsPort == null) {
- //find it
- if (wsPortsTable.get(hti.getPortName()) != null)
- wsPort = (PortComponent) wsPortsTable.get(hti.getPortName());
- else {
- // create it; should not get into here
- wsPort = wsddFactory.createPortComponent();
- wsPort.setPortComponentName(hti.getPortName());
- wsPortsTable.put(wsPort.getPortComponentName(), wsPort);
- }
- }
- wsPortToHandlerTable.put(wsPort.getPortComponentName(), new ArrayList());
- }
-
- // form Handler and ports table
- for (int i = 0; i < handlerTableItems.size(); i++) {
-
- HandlerTableItem hti = (HandlerTableItem) handlerTableItems.get(i);
- String portName = hti.getPortName();
-
- PortComponent port = (PortComponent) wsPortsTable.get(portName);
- if (port == null) return status;
-
- List existingHandlers = port.getHandlers();
-
- Object handler = hti.getHandler();
- if (!existingHandlers.contains(handler)) {
- // create it
- Handler newHandler = wsddFactory.createHandler();
- newHandler.setHandlerName(hti.getHandlerName());
- newHandler.setHandlerClass(hti.getHandlerClassName());
- ((List) wsPortToHandlerTable.get(portName)).add(newHandler);
-
- }
- else if (handler instanceof Handler) {
- // clone it
- EtoolsCopyUtility copyUtil = new EtoolsCopyUtility();
- copyUtil.setCopyAdapters(true);
- Handler clonedHandler = (Handler) copyUtil.copy((Handler) handler);
- ((List) wsPortToHandlerTable.get(portName)).add(clonedHandler);
- }
- }
- }
-
- // remove existing handlers from ports
- removeExistingHandlers(wsPortsTable, wsPortToHandlerTable);
-
- // add ports to wsDescription
- addPortsToDescriptions(wsPortsTable, wsDescription_);
-
- // add handlers to ports
- addHandlersToPorts(wsPortsTable, wsPortToHandlerTable);
- }
- }
- }
-
- // save
- if (wsddResource_ != null) {
- for (int i=0;i<wsddResource_.length;i++) {
- if (wsddResource_[i]!=null)
- wsddResource_[i].save(new HashMap());
- }
- }
-
- }
- catch (Exception e) {
- e.printStackTrace();
- }
-
- return status;
- }
-
- private void removeExistingHandlers(Hashtable portsTable, Hashtable portsToHandlersTable) {
- try {
- Enumeration ports = portsToHandlersTable.keys();
- while (ports.hasMoreElements()) {
- String portName = (String) ports.nextElement();
- Object port = portsTable.get(portName);
- if (port != null && port instanceof PortComponent) {
- List handlers = ((PortComponent) port).getHandlers();
- handlers.clear();
- }
- }
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- private void addPortsToDescriptions(Hashtable portsTable, WebServiceDescription wsDescription_) {
- try {
- Enumeration ports = portsTable.keys();
- while (ports.hasMoreElements()) {
- String portName = (String) ports.nextElement();
- // newly edited port
- Object port = portsTable.get(portName);
-
- // existing port
- List emfPorts = wsDescription_.getPortComponents();
- if (!emfPorts.contains(port) && port != null && port instanceof PortComponent) {
- emfPorts.add((PortComponent) port);
- }
- }
- }
-
- catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- private void addHandlersToPorts(Hashtable portsTable, Hashtable portsToHandlersTable) {
- try {
- Enumeration ports = portsToHandlersTable.keys();
- while (ports.hasMoreElements()) {
- String portName = (String) ports.nextElement();
- Object port = portsTable.get(portName);
- if (port != null && port instanceof PortComponent) {
- List handlers = (List) portsToHandlersTable.get(portName);
-
- List modelHandlers = ((PortComponent) port).getHandlers();
- modelHandlers.addAll(handlers);
- }
- }
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- /**
- * HandlerDescriptionHolder
- * @param hdhs
- */
- public void setHandlerDescriptionHolders(HandlerDescriptionHolder[] hdhs){
- this.handlerDescriptionHolder_ = hdhs;
- }
-
- public void setIsMultipleSelection(boolean isMulitpleSelection) {
- this.isMultipleSelection_ = isMulitpleSelection;
- }
-
-
- public void setWsddResource(WsddResource[] wsddRes) {
- this.wsddResource_ = wsddRes;
- }
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/TableViewerWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/TableViewerWidget.java
deleted file mode 100644
index 1443eae..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/TableViewerWidget.java
+++ /dev/null
@@ -1,639 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 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
- * -------- -------- -----------------------------------------------------------
- * 20060505 139918 pmoogk@ca.ibm.com - Peter Moogk
- * 20110613 349244 kchong@ca.ibm.com - Keith Chong, [Usability] Package to mapping table doesn't handle 'enter' key properly
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.common.PropertiesResourceFilter;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.ui.dialog.DialogUtils;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.TableEditor;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.events.TraverseEvent;
-import org.eclipse.swt.events.TraverseListener;
-import org.eclipse.swt.graphics.Image;
-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.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.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 TableViewerWidget extends SimpleWidgetDataContributor
-{
- private int DEFAULT_TABLE_HEIGHT_HINT = 100;
- private int DEFAULT_COLUMN_WIDTH = 80;
-
- public static byte MAP_ONE_TO_ONE = 3;
- public static byte MAP_MANY_TO_ONE = 1;
- public static byte MAP_MANY_TO_MANY = 0;
-
- private String[] columns_;
- private TableViewer tableViewer_;
- private Table table_;
- private TableEditor editor_;
- private TableEditorListener tableEditorListener_;
- private Text text_;
- private Button import_;
- private Button add_;
- private Button remove_;
-
- private Composite parent_;
- private Listener statusListener_;
-
- private String message = null;
- private byte rescriction = MAP_MANY_TO_MANY;
-
- private List values_;
- private Object defaultValue_;
-
- private PropertiesResourceFilter filter_ = new PropertiesResourceFilter();
-
- public TableViewerWidget(String[] columns, List initValues, Object defaultValue, byte rescriction)
- {
- columns_ = columns;
- values_ = new ArrayList();
- if (initValues != null && initValues.size() > 0)
- values_.addAll(initValues);
- defaultValue_ = (defaultValue != null) ? defaultValue : new String("");
- this.rescriction = rescriction;
- }
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener )
- {
- parent_ = parent;
- statusListener_ = statusListener;
-
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout gl = new GridLayout();
-
- gl.marginHeight = 0;
- gl.marginWidth = 0;
- composite.setLayout(gl);
- composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- table_ = new Table(composite, SWT.SINGLE | SWT.FULL_SELECTION | SWT.BORDER);
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.heightHint = DEFAULT_TABLE_HEIGHT_HINT;
- table_.setLayoutData(gd);
- table_.setHeaderVisible(true);
- table_.setLinesVisible(true);
- TableLayout tableLayout = new TableLayout();
- int maxWidth = DEFAULT_COLUMN_WIDTH;
- for (int i = 0; i < columns_.length; i++)
- {
- TableColumn tableColumn = new TableColumn(table_, SWT.NONE);
- tableColumn.setText(columns_[i]);
- tableColumn.pack();
- int tableColumnWidth = Math.max(DEFAULT_COLUMN_WIDTH, tableColumn.getWidth());
- maxWidth = Math.max(maxWidth, tableColumnWidth);
- ColumnWeightData columnData = new ColumnWeightData(tableColumnWidth, tableColumnWidth, true);
- tableLayout.addColumnData(columnData);
- }
- table_.setLayout(tableLayout);
- // initialize the table editor
- editor_ = new TableEditor(table_);
- // The editor must have the same size as the cell and must
- // not be any smaller than 50 pixels.
- editor_.horizontalAlignment = SWT.LEFT;
- editor_.grabHorizontal = true;
- editor_.minimumWidth = maxWidth;
- tableEditorListener_ = new TableEditorListener();
- table_.addMouseListener(tableEditorListener_);
- tableViewer_ = new TableViewer(table_);
- tableViewer_.getControl().addKeyListener(
- new KeyListener()
- {
- public void keyPressed(KeyEvent e)
- {
- int asciiDel = (int)e.character;
- // Del
- if (asciiDel == 127)
- handleDeleteKeyPressed();
- // Enter or space
- if (((int)e.character) == 13 || ((int)e.character) == 32)
- tableEditorListener_.editSelection();
- }
- public void keyReleased(KeyEvent e)
- {
- }
- }
- );
- tableViewer_.setContentProvider(new ListContentProvider());
- tableViewer_.setLabelProvider(new ListLabelProvider());
- tableViewer_.setInput(values_);
- tableViewer_.addSelectionChangedListener(
- new ISelectionChangedListener()
- {
- public void selectionChanged(SelectionChangedEvent event)
- {
- enableRemove(true);
- }
- }
- );
-
- Composite buttonComposite = new Composite(composite, SWT.NONE);
- gl = new GridLayout();
- gl.numColumns = 3;
- gl.makeColumnsEqualWidth = true;
- buttonComposite.setLayout(gl);
- buttonComposite.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_BEGINNING));
-
- import_ = new Button(buttonComposite, SWT.PUSH);
- import_.setText(ConsumptionUIMessages.LABEL_IMPORT);
- import_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- import_.addSelectionListener(
- new SelectionListener()
- {
- public void widgetSelected(SelectionEvent event)
- {
- handleImportButtonSelected(event);
- }
- public void widgetDefaultSelected(SelectionEvent event)
- {
- }
- }
- );
-
- add_ = new Button(buttonComposite, SWT.PUSH);
- add_.setText(ConsumptionUIMessages.LABEL_ADD);
- add_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- add_.addSelectionListener(
- new SelectionListener()
- {
- public void widgetSelected(SelectionEvent event)
- {
- handleAddButtonSelected(event);
- }
- public void widgetDefaultSelected(SelectionEvent event)
- {
- }
- }
- );
-
-
- remove_ = new Button(buttonComposite, SWT.PUSH);
- remove_.setText(ConsumptionUIMessages.LABEL_REMOVE);
- remove_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- remove_.addSelectionListener(
- new SelectionListener()
- {
- public void widgetSelected(SelectionEvent event)
- {
- handleRemoveButtonSelected(event);
- }
- public void widgetDefaultSelected(SelectionEvent event)
- {
- }
- }
- );
- enableRemove(false);
-
- return this;
- }
-
- private void enableRemove(boolean enabled)
- {
- remove_.setEnabled(enabled && !tableViewer_.getSelection().isEmpty());
- }
-
- private void handleImportButtonSelected(SelectionEvent event)
- {
- IResource resource = DialogUtils.browseResources(
- parent_.getShell(),
- ResourceUtils.getWorkspaceRoot(),
- null,
- filter_
- );
- if (resource != null && resource instanceof IFile)
- {
- try
- {
- Properties props = new Properties();
- props.load(((IFile)resource).getContents());
- Set set = props.entrySet();
- java.util.List list = new LinkedList();
- Iterator i = set.iterator();
- while (i.hasNext())
- {
- Map.Entry me = (Map.Entry)i.next();
- String key = (String)me.getKey();
- String val = (String)me.getValue();
- list.add(new String[] {key,val});
- }
- values_.addAll(list);
- }
- catch (Exception e)
- {
- // TODO Report some error here.
- }
- }
- refresh();
- }
-
- private void handleAddButtonSelected(SelectionEvent event)
- {
- values_.add(defaultValue_);
- refresh();
- setSelectionAsObject(values_.get(table_.getItemCount()-1));
- tableEditorListener_.editSelection();
- }
-
- private void handleRemoveButtonSelected(SelectionEvent event)
- {
- handleDeleteKeyPressed();
- }
-
- private void handleDeleteKeyPressed()
- {
- internalDispose();
- ISelection selection = tableViewer_.getSelection();
- if (selection != null && !selection.isEmpty() && (selection instanceof IStructuredSelection))
- {
- int selectionIndex = table_.getSelectionIndex();
- int selectionCount = table_.getItemCount();
- values_.remove(selectionIndex);
- if (selectionIndex < selectionCount-1)
- setSelectionAsObject(values_.get(selectionIndex));
- else if (selectionCount -2 >= 0)
- setSelectionAsObject(values_.get(selectionCount-2));
- refresh();
- }
- }
-
- private void internalRefresh()
- {
- // synchronize text field, previously selected table cell and model (inputObject)
- if (text_ != null)
- {
- TableItem oldTableItem = editor_.getItem();
- int oldColumnIndex = editor_.getColumn();
- if (oldTableItem != null && oldColumnIndex >= 0 && oldColumnIndex < columns_.length)
- {
- String oldText = text_.getText();
- oldTableItem.setText(oldColumnIndex, oldText);
- int oldRowIndex = table_.indexOf(oldTableItem);
- values_.set(oldRowIndex, new String[] {oldTableItem.getText(0), oldTableItem.getText(1)});
- }
- }
- checkMappingConstraints();
- statusListener_.handleEvent( null );
- }
-
- private void checkMappingConstraints() {
-
- HashMap map = new HashMap();
-
- for(int cnt=0; cnt<values_.size(); cnt++){
- String[] value = (String[])values_.get(cnt);
- if(map.containsKey(value[0]) && ((rescriction & 1)!=0)){
- message =NLS.bind(ConsumptionUIMessages.MSG_MAPPING_DUPLICATE_ENTRIES, new String[]{columns_[0],columns_[1]});
- return;
- }
- if(map.containsValue(value[1]) && ((rescriction & 2)!=0)){
- message =NLS.bind(ConsumptionUIMessages.MSG_MAPPING_DUPLICATE_ENTRIES, new String[]{columns_[1],columns_[0]});
- return;
- }
- map.put(value[0],value[1]);
-
- }
- message = null;
-
- }
-
- public IStatus getStatus()
- {
- return message == null ? Status.OK_STATUS :
- StatusUtils.errorStatus( message );
- }
-
- private void setSelectionAsObject(Object object)
- {
- tableViewer_.setSelection(new StructuredSelection(object), true);
- }
-
- public void refresh()
- {
- internalRefresh();
- tableViewer_.refresh();
- }
-
- public TableItem[] getItems()
- {
- //internalRefresh();
- return table_.getItems();
- }
-
- public void setEnabled(boolean enabled)
- {
- add_.setEnabled(enabled);
- enableRemove(enabled);
- }
-
- public void dispose()
- {
- internalDispose();
- if (editor_ != null)
- editor_.dispose();
- if (table_ != null)
- table_.dispose();
- if (add_ != null)
- add_.dispose();
- if (remove_ != null)
- remove_.dispose();
- }
-
- private void internalDispose()
- {
- if (text_ != null)
- text_.dispose();
- text_ = null;
- }
-
- protected class TableEditorListener implements MouseListener
- {
- private int currSelectionIndex_;
- private int editRow_;
- private int editColumn_;
-
- public TableEditorListener()
- {
- super();
- currSelectionIndex_ = -1;
- editRow_ = -1;
- editColumn_ = -1;
- }
-
- public void mouseDoubleClick(MouseEvent e)
- {
- mouseDown(e);
- }
-
- public void mouseDown(MouseEvent e)
- {
- // refresh table
- internalRefresh();
- // Clean up previous text editor control
- internalDispose();
- // update table
- if (table_.isFocusControl())
- {
- int selectedRowIndex = getSelectedRow(table_, e.y);
- if (currSelectionIndex_ != -1 && selectedRowIndex != -1 && currSelectionIndex_ == selectedRowIndex)
- {
- TableItem tableItem = table_.getItem(selectedRowIndex);
- int selectedColumnIndex = getSelectedColumn(tableItem, e.x, e.y);
- if (selectedColumnIndex != -1 && (text_ == null || text_.isDisposed() || selectedColumnIndex != editor_.getColumn()))
- editSelection(selectedRowIndex, selectedColumnIndex);
- }
- currSelectionIndex_ = selectedRowIndex;
- }
- }
-
- public void mouseUp(MouseEvent e)
- {
- }
-
- private int getSelectedRow(Table table, int y)
- {
- TableItem[] tableItems = table.getItems();
- for (int i = 0; i < tableItems.length; i++)
- {
- Rectangle rectangle = tableItems[i].getBounds(0);
- if (rectangle != null && y >= rectangle.y && y < (rectangle.y + rectangle.height))
- return i;
- }
- return -1;
- }
-
- private int getSelectedColumn(TableItem tableItem, int x, int y)
- {
- for (int i = 0; i < columns_.length; i++)
- {
- if (tableItem.getBounds(i).contains(x, y))
- return i;
- }
- return -1;
- }
-
- private void editSelection(int row, int column)
- {
- editRow_ = row;
- editColumn_ = column;
- TableItem tableItem = table_.getItem(row);
- // Setup adapter for the new selection
- text_ = new Text(table_, SWT.NONE);
- String text = tableItem.getText(column);
- text_.setText((text != null) ? text : "");
- text_.addKeyListener(new KeyListener()
- {
- public void keyPressed(KeyEvent e)
- {
- // Esc
- if (((int)e.character) == 27)
- cancelSelection();
- if (e.character == SWT.CR)
- {
- // Handle the carriage return and set the value
- internalRefresh();
- internalDispose();
- }
- }
- public void keyReleased(KeyEvent e)
- {
- }
- }
- );
- text_.addTraverseListener(new TraverseListener()
- {
- public void keyTraversed(TraverseEvent e)
- {
- if (e.detail == SWT.TRAVERSE_TAB_NEXT)
- traverseTabNext();
- else if (e.detail == SWT.TRAVERSE_TAB_PREVIOUS)
- traverseTabPrevious();
- else if (e.detail == SWT.TRAVERSE_RETURN)
- e.doit = false;
- }
- }
- );
-
- text_.addFocusListener( new FocusAdapter()
- {
- public void focusLost(FocusEvent e)
- {
- internalRefresh();
- }
- } );
-
- editor_.setEditor(text_, tableItem, column);
- text_.setFocus();
- text_.selectAll();
- }
-
- protected void traverseTabNext()
- {
- internalRefresh();
- internalDispose();
- if (!(editRow_ == table_.getItems().length-1 && editColumn_ == columns_.length-1))
- {
- if (editColumn_ < columns_.length-1)
- editColumn_++;
- else
- {
- editColumn_ = 0;
- editRow_++;
- table_.select(editRow_);
- }
- editSelection(editRow_, editColumn_);
- }
- }
-
- protected void traverseTabPrevious()
- {
- internalRefresh();
- internalDispose();
- if (!(editRow_ == 0 && editColumn_ == 0))
- {
- if (editColumn_ > 0)
- editColumn_--;
- else
- {
- editColumn_ = columns_.length-1;
- editRow_--;
- table_.select(editRow_);
- }
- editSelection(editRow_, editColumn_);
- }
- }
-
- public void cancelSelection()
- {
- internalDispose();
- internalRefresh();
- }
-
- public void editSelection()
- {
- int selectedRowIndex = table_.getSelectionIndex();
- if (selectedRowIndex != -1 && columns_.length > 0)
- {
- // refresh table
- internalRefresh();
- // Clean up any previous editor control
- internalDispose();
- editSelection(selectedRowIndex, 0);
- }
- currSelectionIndex_ = selectedRowIndex;
- }
- }
-
- protected class ListContentProvider implements IStructuredContentProvider
- {
- public void dispose()
- {
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
- {
- tableViewer_.add(getElements(newInput));
- }
-
- public Object[] getElements(Object inputElement)
- {
- if (inputElement instanceof List)
- {
- List list = (List)inputElement;
- Object[] objects = new Object[list.size()];
- for (int i = 0; i < objects.length; i++)
- objects[i] = list.get(i);
- return objects;
- }
- else
- return new Object[0];
- }
- }
-
- protected class ListLabelProvider implements ITableLabelProvider
- {
- public Image getColumnImage(Object element, int columnIndex)
- {
- return null;
- }
-
- public String getColumnText(Object element, int columnIndex)
- {
- return ((String[])element)[columnIndex];
- }
-
- public void addListener(ILabelProviderListener listener)
- {
- }
-
- public void removeListener(ILabelProviderListener listener)
- {
- }
-
- public boolean isLabelProperty(Object element, String property)
- {
- return true;
- }
-
- public void dispose()
- {
- }
- }
- }
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/TimedWSDLSelectionConditionCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/TimedWSDLSelectionConditionCommand.java
deleted file mode 100644
index f56b6e0..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/TimedWSDLSelectionConditionCommand.java
+++ /dev/null
@@ -1,93 +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
- * -------- -------- -----------------------------------------------------------
- * 20060504 119296 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.wst.command.internal.env.core.common.Condition;
-import org.eclipse.wst.command.internal.env.ui.common.TimedOperation;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-public class TimedWSDLSelectionConditionCommand extends AbstractDataModelOperation implements Condition
-{
- private final String TIMEOUT_PREFERENCE = "wsdlTimeOut";
- private WSDLSelectionConditionCommand selectionCommand;
- private int timeOutValue;
-
- public TimedWSDLSelectionConditionCommand()
- {
- selectionCommand = new WSDLSelectionConditionCommand();
-
- IPreferenceStore prefStore = WebServiceConsumptionUIPlugin.getInstance().getPreferenceStore();
-
- timeOutValue = prefStore.getDefaultString(TIMEOUT_PREFERENCE).equals("") ? 10000 : prefStore.getInt( TIMEOUT_PREFERENCE );
- }
-
- public void setWebServicesParser(WebServicesParser webServicesParser)
- {
- selectionCommand.setWebServicesParser( webServicesParser );
- }
-
- public WebServicesParser getWebServicesParser()
- {
- return selectionCommand.getWebServicesParser();
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- String timeOutMessage = ConsumptionUIMessages.bind( ConsumptionUIMessages.MSG_INFO_WSDL_OPERATION_TIMED_OUT, getWebServiceURI() );
-
- TimedOperation timedOperation = new TimedOperation( selectionCommand, timeOutValue, timeOutMessage );
-
- return timedOperation.execute(monitor, adaptable);
- }
-
- public boolean evaluate()
- {
- return selectionCommand.evaluate();
- }
-
- public String getWebServiceURI()
- {
- return selectionCommand.getWebServiceURI();
- }
-
- public void setWebServiceURI(String webServiceURI)
- {
- selectionCommand.setWebServiceURI(webServiceURI);
- }
-
- public String getWsdlURI()
- {
- return getWebServiceURI();
- }
-/**
- * @return Returns the httpBasicAuthPassword.
- */
-public String getHttpBasicAuthPassword() {
- return selectionCommand.getHttpBasicAuthPassword();
-}
-/**
- * @return Returns the httpBasicAuthUsername.
- */
-public String getHttpBasicAuthUsername() {
- return selectionCommand.getHttpBasicAuthUsername();
-}
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionConditionCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionConditionCommand.java
deleted file mode 100644
index bb6049a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionConditionCommand.java
+++ /dev/null
@@ -1,135 +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.consumption.ui.widgets;
-
-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.jst.ws.internal.consumption.ui.wsil.DialogWWWAuthentication;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.core.common.Condition;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-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 WSDLSelectionConditionCommand extends AbstractDataModelOperation implements Condition
-{
- private WebServicesParser webServicesParser;
- private String webServiceURI;
- private String httpBasicAuthUsername;
- private String httpBasicAuthPassword;
- private boolean needWSDLSelectionTreeWidget;
-
- public WSDLSelectionConditionCommand()
- {
- }
-
- public void setWebServicesParser(WebServicesParser webServicesParser)
- {
- this.webServicesParser = webServicesParser;
- }
-
- public WebServicesParser getWebServicesParser()
- {
- if (webServicesParser == null)
- webServicesParser = new WebServicesParserExt();
- return webServicesParser;
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- needWSDLSelectionTreeWidget = false;
- WebServicesParser parser = getWebServicesParser();
- parser.setURI(webServiceURI);
- try
- {
- parser.parse(WebServicesParser.PARSE_WSIL | WebServicesParser.PARSE_DISCO | WebServicesParser.PARSE_LINKS);
- }
- catch (WWWAuthenticationException wwwae)
- {
- DialogWWWAuthentication dialog = new DialogWWWAuthentication(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell());
- dialog.handleWWWAuthentication(wwwae);
- String username = dialog.getUsername();
- String password = dialog.getPassword();
- httpBasicAuthUsername = username;
- httpBasicAuthPassword = password;
- if (username != null && password != null)
- {
- parser.setHTTPBasicAuthUsername(username);
- parser.setHTTPBasicAuthPassword(password);
- try
- {
- parser.parse(WebServicesParser.PARSE_WSIL | WebServicesParser.PARSE_DISCO | WebServicesParser.PARSE_LINKS);
- }
- catch (Throwable t)
- {
- return StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_ERROR_URI_NOT_RESOLVABLE, new Object[] {webServiceURI}), t);
- }
- finally
- {
- parser.setHTTPBasicAuthUsername(null);
- parser.setHTTPBasicAuthPassword(null);
- }
- }
- }
- catch (Throwable t)
- {
- return StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_ERROR_URI_NOT_RESOLVABLE, new Object[] {webServiceURI}), t);
- }
- WebServiceEntity wsEntity = parser.getWebServiceEntityByURI(webServiceURI);
- if (wsEntity != null)
- {
- int type = wsEntity.getType();
- if (type != WebServiceEntity.TYPE_WSDL)
- needWSDLSelectionTreeWidget = true;
- }
- return Status.OK_STATUS;
- }
-
- public boolean evaluate()
- {
- return needWSDLSelectionTreeWidget;
- }
-
- public String getWebServiceURI()
- {
- return webServiceURI;
- }
-
- public void setWebServiceURI(String webServiceURI)
- {
- this.webServiceURI = webServiceURI;
- }
-
- public String getWsdlURI()
- {
- return getWebServiceURI();
- }
-/**
- * @return Returns the httpBasicAuthPassword.
- */
-public String getHttpBasicAuthPassword() {
- return httpBasicAuthPassword;
-}
-/**
- * @return Returns the httpBasicAuthUsername.
- */
-public String getHttpBasicAuthUsername() {
- return httpBasicAuthUsername;
-}
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionDialog.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionDialog.java
deleted file mode 100644
index a24276e..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionDialog.java
+++ /dev/null
@@ -1,97 +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
- * -------- -------- -----------------------------------------------------------
- * 20060525 142281 joan@ca.ibm.com - Joan Haggarty
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.SWT;
-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;
-
-public class WSDLSelectionDialog extends AbstractSelectionDialog {
-
- private String titleText_;
- private String wsUri_;
- private String componentName_;
- private IProject project_;
-
- public WSDLSelectionDialog(Shell parent, PageInfo pageInfo) {
- super(parent, pageInfo);
- titleText_ = pageInfo.getPageName();
- }
-
- protected void callSetters()
- {
- ((WSDLSelectionWidgetWrapper)getWidget()).setComponentName(componentName_);
- ((WSDLSelectionWidgetWrapper)getWidget()).setProject(project_);
- ((WSDLSelectionWidgetWrapper)getWidget()).setWebServiceURI(wsUri_);
- }
-
- public void setComponentName(String componentName)
- {
- componentName_ = componentName;
- }
-
- public String getComponentName()
- {
- return componentName_ ;
- }
-
- public void setProject(IProject project)
- {
- project_ = project;
- }
-
- public void setWebServiceURI(String wsUri)
- {
- wsUri_ = wsUri;
- }
-
- 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 ((WSDLSelectionWidgetWrapper)getWidget()).getObjectSelectionDisplayableString();
- }
-
- public IStructuredSelection getObjectSelection() {
- return ((WSDLSelectionWidgetWrapper)getWidget()).getObjectSelection();
- }
-
- public String getWebServiceURI()
- {
- return wsUri_;
- }
-
- public IProject getProject(){
- return project_;
- }
-
- public boolean close() {
- setComponentName(((WSDLSelectionWidgetWrapper)getWidget()).getComponentName());
- setProject(((WSDLSelectionWidgetWrapper)getWidget()).getProject());
- setWebServiceURI(((WSDLSelectionWidgetWrapper)getWidget()).getWebServiceURI());
- return super.close();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionOutputCommand.java
deleted file mode 100644
index 861311e..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionOutputCommand.java
+++ /dev/null
@@ -1,138 +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
- * -------- -------- -----------------------------------------------------------
- * 20060413 135581 rsinha@ca.ibm.com - Rupam Kuehner
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import java.util.Map;
-
-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.consumption.ui.ConsumptionUIMessages;
-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.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-public class WSDLSelectionOutputCommand extends AbstractDataModelOperation
-{
- private WebServicesParser webServicesParser;
- private String wsdlURI;
- private IProject project;
- private String componentName;
-
- private boolean testService;
-
-
- public boolean getTestService() {
- return testService;
- }
-
-
- public void setTestService(boolean testService) {
- this.testService = testService;
- }
-
- /**
- * @return Returns the project.
- */
- public IProject getProject()
- {
- return project;
- }
-
- /**
- * @param project
- * The project to set.
- */
- public void setProject(IProject project)
- {
- this.project = project;
- }
-
-
-
- public String getComponentName()
- {
- return componentName;
- }
-
- public void setComponentName(String componentName)
- {
- this.componentName = componentName;
- }
-
- public String getWsdlURI()
- {
- return wsdlURI;
- }
-
- public void setWsdlURI(String wsdlURI)
- {
- this.wsdlURI = wsdlURI;
- }
-
- /**
- * @return Returns the webServicesParser.
- */
- public WebServicesParser getWebServicesParser()
- {
- if (webServicesParser != null)
- return webServicesParser;
- else
- return new WebServicesParserExt();
- }
-
- /**
- * @param webServicesParser to set.
- */
- public void setWebServicesParser(WebServicesParser webServicesParser)
- {
- this.webServicesParser = webServicesParser;
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
-
- if (wsdlURI != null && getWebServicesParser().getWSDLDefinition(wsdlURI) != null) {
- IStatus status = Status.OK_STATUS;
- Map services = getWebServicesParser().getWSDLDefinition(wsdlURI).getServices();
- if (services.isEmpty()){
- if (testService==true){
- testService = false;
- status = StatusUtils.warningStatus( ConsumptionUIMessages.MSG_WARNING_NO_SERVICE_ELEMENT );
- try{
- env.getStatusHandler().report(status);
- }catch(Exception e){
- status = StatusUtils.errorStatus( ConsumptionUIMessages.MSG_WARNING_NO_SERVICE_ELEMENT );
- }
- }
- }
- return status;
- }
- else
- {
- IStatus status = StatusUtils.errorStatus( ConsumptionUIMessages.PAGE_MSG_SELECTION_MUST_BE_WSDL );
- if (env != null)
- {
- env.getStatusHandler().reportError(status);
- }
- return status;
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionTreeWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionTreeWidget.java
deleted file mode 100644
index 28cc163..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionTreeWidget.java
+++ /dev/null
@@ -1,291 +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
- * -------- -------- -----------------------------------------------------------
- * 20060418 136712 joan@ca.ibm.com - Joan Haggarty
- * 20070131 168786 makandre@ca.ibm.com - Andrew Mak, wsdl url on web service wizard page 1 is not reflected in browse dialog
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Tree;
-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;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServiceEntity;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-/**
-* This wizard page allows the user to select the WSDL URI for consumption
-*/
-public class WSDLSelectionTreeWidget extends SimpleWidgetDataContributor
-{
- private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-
- /*CONTEXT_ID PWWS0001 for the WSDL Selection Page*/
- private final String INFOPOP_PWWS_PAGE = ".PWWS0001";
-
- private WebServicesParser webServicesParser;
- private String webServiceURI;
-
- private Listener statusListener;
- private TreeViewer treeViewer_;
- private TreeContentProvider treeContentProvider;
- private Tree tree_;
- private int pageWidth_;
- private WebServiceEntity entity_;
-
- /**
- * Default constructor.
- */
- public WSDLSelectionTreeWidget()
- {
- }
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener )
- {
- this.statusListener = statusListener;
- parent.setToolTipText(ConsumptionUIMessages.TOOLTIP_PWWS_PAGE);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, pluginId_ + INFOPOP_PWWS_PAGE);
-
- Label wsdlLabel = new Label(parent, SWT.WRAP);
- wsdlLabel.setText(ConsumptionUIMessages.LABEL_SELECT_WSDL);
- wsdlLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
- tree_ = new Tree(parent, SWT.SINGLE | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.heightHint = 200;
- tree_.setLayoutData(gd);
- pageWidth_ = tree_.getShell().getSize().x;
- treeViewer_ = new TreeViewer(tree_);
- treeContentProvider = new TreeContentProvider();
- treeViewer_.setContentProvider(treeContentProvider);
- treeViewer_.setLabelProvider(new TreeLabelProvider());
- treeViewer_.addSelectionChangedListener(
- new ISelectionChangedListener()
- {
- public void selectionChanged(SelectionChangedEvent event)
- {
- handleTreeSelectionChangedEvent(event);
- }
- }
- );
- return this;
- }
-
- private void handleTreeSelectionChangedEvent(SelectionChangedEvent event)
- {
- statusListener.handleEvent(new Event());
- }
-
- /**
- * @return Returns the webServicesParser.
- */
- public WebServicesParser getWebServicesParser()
- {
- return webServicesParser;
- }
- /**
- * @param webServicesParser The webServicesParser to set.
- */
- public void setWebServicesParser(WebServicesParser webServicesParser)
- {
- this.webServicesParser = webServicesParser;
- treeViewer_.setInput(this.webServicesParser);
- refreshTreeViewer();
- }
-
- public void setWebServiceURI(String wsURI)
- {
- webServiceURI = wsURI;
- if (!tree_.isDisposed()) {
- treeContentProvider.setWebServiceURI(webServiceURI);
- refreshTreeViewer();
- }
- }
-
- public void refreshTreeViewer()
- {
- if (webServicesParser != null && webServiceURI != null)
- {
- treeViewer_.refresh();
- Control shell = tree_.getShell();
- if (tree_.getSize().x > pageWidth_ || shell.getSize().x > pageWidth_)
- {
- tree_.setSize(pageWidth_, tree_.getSize().y);
- shell.setSize(pageWidth_, shell.getSize().y);
- shell.computeSize(SWT.DEFAULT, SWT.DEFAULT);
- shell.redraw();
- }
- }
- }
-
- public void setEnabled(boolean enabled)
- {
- tree_.setEnabled(enabled);
- }
-
- public boolean isEnabled()
- {
- return tree_.isEnabled();
- }
-
- public String getWsdlURI()
- {
- if (entity_ != null)
- return entity_.getURI();
- else
- return webServiceURI;
- }
-
- private WebServiceEntity getSelectionAsWebServiceEntity()
- {
- if (treeViewer_ != null)
- {
- ISelection sel = treeViewer_.getSelection();
- if (!sel.isEmpty() && (sel instanceof IStructuredSelection))
- {
- IStructuredSelection ssel = (IStructuredSelection)sel;
- Object object = ssel.getFirstElement();
- if (object instanceof WebServiceEntity)
- return (WebServiceEntity)object;
- }
- }
- return null;
- }
-
- public IStatus getStatus()
- {
- entity_ = getSelectionAsWebServiceEntity();
- if (entity_ == null || entity_.getType() != WebServiceEntity.TYPE_WSDL)
- return StatusUtils.errorStatus( ConsumptionUIMessages.PAGE_MSG_SELECTION_MUST_BE_WSDL );
- else
- return Status.OK_STATUS;
- }
-
- private class TreeContentProvider implements ITreeContentProvider
- {
- private String webServiceURI;
-
- public void dispose()
- {
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
- {
- }
-
- public Object[] getElements(Object inputElement)
- {
- if (inputElement instanceof WebServicesParser)
- {
- WebServicesParser parser = (WebServicesParser)inputElement;
- Object wsEntity = parser.getWebServiceEntityByURI(webServiceURI);
- if (wsEntity != null)
- return new Object[] {wsEntity};
- }
- return new Object[0];
- }
-
- public Object[] getChildren(Object parentElement)
- {
- if (parentElement instanceof WebServiceEntity)
- {
- List list = ((WebServiceEntity)parentElement).getChildren();
- Object[] objects = new Object[list.size()];
- for (int i = 0; i < objects.length; i++)
- objects[i] = list.get(i);
- return objects;
- }
- return new Object[0];
- }
-
- public Object getParent(Object element)
- {
- if (element instanceof WebServiceEntity)
- return ((WebServiceEntity)element).getParent();
- return new Object[0];
- }
-
- public boolean hasChildren(Object element)
- {
- return (getChildren(element).length > 0);
- }
-
- public void setWebServiceURI(String wsURI)
- {
- webServiceURI = wsURI;
- }
- }
-
- private class TreeLabelProvider implements ILabelProvider
- {
- public Image getImage(Object element)
- {
- switch (((WebServiceEntity)element).getType())
- {
- case WebServiceEntity.TYPE_HTML:
- return WebServiceConsumptionUIPlugin.getImageDescriptor("icons/wsil/html.gif").createImage();
- case WebServiceEntity.TYPE_WSIL:
- return WebServiceConsumptionUIPlugin.getImageDescriptor("icons/wsil/wsil.gif").createImage();
- case WebServiceEntity.TYPE_WSDL:
- return WebServiceConsumptionUIPlugin.getImageDescriptor("icons/wsil/wsdl.gif").createImage();
- default:
- return null;
- }
- }
-
- public String getText(Object element)
- {
- return ((WebServiceEntity)element).getURI();
- }
-
- public void addListener(ILabelProviderListener listener)
- {
- }
-
- public void removeListener(ILabelProviderListener listener)
- {
- }
-
- public boolean isLabelProperty(Object element, String property)
- {
- return true;
- }
-
- public void dispose()
- {
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetDefaultingCommand.java
deleted file mode 100644
index 738e580..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,215 +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
- * -------- -------- -----------------------------------------------------------
- * 20070116 159618 makandre@ca.ibm.com - Andrew Mak, Project and EAR not defaulted properly when wizard launched from JSR-109 Web services branch in J2EE Project Explorer
- * 20070327 172339 kathy@ca.ibm.com - Kathy Chan
- * 20070125 171071 makandre@ca.ibm.com - Andrew Mak, Create public utility method for copying WSDL files
- * 20070410 181827 kathy@ca.ibm.com - Kathy Chan
- * 20080220 219537 makandre@ca.ibm.com - Andrew Mak
- * 20080501 229728 makandre@ca.ibm.com - Andrew Mak, uppercase .WSDL cannot be found by the Web Service Client wizard
- * 20081208 257618 mahutch@ca.ibm.com - Mark Hutchinson, Add Mechanism for Adopters to map Services to WSDL URLs
- * 20090310 242440 yenlu@ca.ibm.com - Yen Lu, Pluggable IFile to URI Converter
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-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.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.ws.internal.common.J2EEActionAdapterFactory;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.converter.IIFile2UriConverter;
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-import org.eclipse.wst.ws.internal.ui.utils.AdapterUtils;
-import org.eclipse.wst.ws.internal.util.UniversalPathTransformer;
-import org.eclipse.wst.ws.internal.wsfinder.WSDLURLStringWrapper;
-import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-public class WSDLSelectionWidgetDefaultingCommand extends AbstractDataModelOperation
-{
- private IStructuredSelection selection_;
- private String uri_;
-
- public String getWebServiceURI()
- {
- if (uri_ != null)
- return uri_;
-
- uri_ = "";
-
- if (selection_ != null && !selection_.isEmpty())
- {
- Object firstSel = selection_.getFirstElement();
- if (firstSel instanceof IFile)
- {
- IFile ifile = (IFile)firstSel;
- String ext = ifile.getFileExtension();
- if (ext != null && (ext.equalsIgnoreCase("wsdl") || ext.equalsIgnoreCase("wsil") || ext.equalsIgnoreCase("html")))
- {
- IIFile2UriConverter converter = WSPlugin.getInstance().getIFile2UriConverter();
- boolean allowBaseConversionOnFailure = true;
- if (converter != null)
- {
- uri_ = converter.convert(ifile);
- if (uri_ == null)
- allowBaseConversionOnFailure = converter.allowBaseConversionOnFailure();
-
- }
- if ((uri_ == null || uri_.length() == 0) && allowBaseConversionOnFailure)
- uri_ = ifile.getFullPath().toString();
- }
- }
- else if (Platform.getAdapterManager().hasAdapter(firstSel, WSDLURLStringWrapper.class.getName())) {
- Object adaptedObject = Platform.getAdapterManager().loadAdapter(firstSel, WSDLURLStringWrapper.class.getName());
- WSDLURLStringWrapper wrapper = (WSDLURLStringWrapper)adaptedObject;
- uri_ = wrapper.getWSDLURLString();
- }
- else if (firstSel instanceof ServiceImpl)
- {
- ServiceImpl serviceImpl = (ServiceImpl)firstSel;
- uri_ = J2EEActionAdapterFactory.getWSDLURI(serviceImpl);
- } else if (firstSel instanceof ServiceRef)
- {
- ServiceRef serviceRef = (ServiceRef)firstSel;
- uri_ = J2EEActionAdapterFactory.getWSDLURI(serviceRef);
- } else if (firstSel instanceof WSDLResourceImpl)
- {
- WSDLResourceImpl wsdlRI = (WSDLResourceImpl)firstSel;
- uri_ = J2EEActionAdapterFactory.getWSDLURI(wsdlRI);
- } else if (firstSel instanceof String)
- {
- uri_ = (String)firstSel;
- } else {
- String adaptedUri = AdapterUtils.getAdaptedWSDL(firstSel);
- if (adaptedUri != null) {
- uri_ = adaptedUri;
- }
- }
-
- uri_ = UniversalPathTransformer.toPath(uri_);
- }
- return uri_;
- }
-
- public void setInitialSelection( IStructuredSelection selection )
- {
- selection_ = selection;
- uri_ = null;
- }
-
- public boolean getGenWSIL()
- {
- return false;
- }
-
- public String getWsilURI()
- {
- String wsURI = getWebServiceURI();
- if (wsURI != null && wsURI.length() > 0 && wsURI.toLowerCase().endsWith("wsdl"))
- {
- StringBuffer sb = new StringBuffer(wsURI.substring(0, wsURI.length()-4));
- sb.append("wsil");
- return sb.toString();
- }
- return "";
- }
-
- public IProject getProject()
- {
- IProject p = getProjectFromInitialSelection(selection_);
- return p;
- }
-
- public String getComponentName()
- {
- String cname = getComponentNameFromInitialSelection(selection_);
- return cname;
- }
-
- private boolean hasProtocol(String url) {
- return url.indexOf(":") != -1;
- }
-
- private IProject getProjectFromInitialSelection(IStructuredSelection selection)
- {
- if (selection != null && selection.size() == 1)
- {
- Object obj = selection.getFirstElement();
- if (obj != null)
- {
- try
- {
- IResource resource = ResourceUtils.getResourceFromSelection(obj);
- if (resource==null) {
- String uri = getWebServiceURI();
- if (hasProtocol(uri)) return null;
- return ResourceUtils.getProjectOf(new Path(uri));
- }
- else
- return ResourceUtils.getProjectOf(resource.getFullPath());
- } catch(CoreException e)
- {
- return null;
- }
- }
- }
- return null;
- }
-
- private String getComponentNameFromInitialSelection(IStructuredSelection selection)
- {
- if (selection != null && selection.size() == 1)
- {
- Object obj = selection.getFirstElement();
- if (obj != null)
- {
- try
- {
- IResource resource = ResourceUtils.getResourceFromSelection(obj);
- IVirtualComponent comp;
- if (resource==null) {
- String uri = getWebServiceURI();
- if (hasProtocol(uri)) return null;
- comp = ResourceUtils.getComponentOf(new Path(uri)) ;
- }
- else
- comp = ResourceUtils.getComponentOf(resource);
- if (comp!=null)
- {
- return comp.getName();
- }
- } catch(CoreException e)
- {
- return null;
- }
- }
- }
- return null;
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
- {
- return Status.OK_STATUS;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetWrapper.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetWrapper.java
deleted file mode 100644
index 56a9a6a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetWrapper.java
+++ /dev/null
@@ -1,144 +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
- * -------- -------- -----------------------------------------------------------
- * 20060420 135912 joan@ca.ibm.com - Joan Haggarty
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWrapper;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-public class WSDLSelectionWidgetWrapper extends SimpleWidgetDataContributor
-{
- private WSDLSelectionWidget wsdlSelectionWidget;
- private IProject project;
- private String componentName;
-
- public WSDLSelectionWidgetWrapper()
- {
- wsdlSelectionWidget = new WSDLSelectionWidget();
- }
-
- public WidgetDataEvents addControls(Composite parent, Listener statusListener)
- {
- wsdlSelectionWidget.addControls(parent, statusListener);
- return this;
- }
-
- public IStatus getStatus()
- {
- return wsdlSelectionWidget.getStatus();
- }
-
- public void setWebServiceURI(String wsUri)
- {
- IStructuredSelection sel;
- if (wsUri != null)
- sel = new StructuredSelection(wsUri);
- else
- sel = new StructuredSelection();
- wsdlSelectionWidget.setInitialSelection(sel);
- }
-
- public String getWebServiceURI()
- {
- IStructuredSelection sel = wsdlSelectionWidget.getObjectSelection();
- Object object = sel.getFirstElement();
- String result = null;
-
- if (object != null )
- {
- if( object instanceof WSDLSelectionWrapper )
- {
- // Get at the inner structured selection object.
- WSDLSelectionWrapper wrapper = (WSDLSelectionWrapper)object;
- IStructuredSelection innerSelection = wrapper.wsdlSelection;
- Object innerObject = innerSelection.getFirstElement();
-
- result = innerObject == null ? null : innerObject.toString();
- }
- else
- {
- result = object.toString();
- }
- }
-
- return result;
- }
-
- public String getWsdlURI()
- {
- return getWebServiceURI();
- }
-
- public WebServicesParser getWebServicesParser()
- {
- return wsdlSelectionWidget.getWebServicesParser();
- }
-
- public void setProject(IProject project)
- {
- this.project = project;
- }
-
- public IProject getProject()
- {
- IProject p = wsdlSelectionWidget.getProject();
- if (p==null)
- {
- return project;
- }
- else
- return p;
- }
-
- public String getComponentName()
- {
- String cname = wsdlSelectionWidget.getComponentName();
- if (cname==null)
- {
- return componentName;
- }
- else
- return cname;
- }
-
- public void setComponentName(String componentName)
- {
- this.componentName = componentName;
- }
-
- public String getObjectSelectionDisplayableString() {
- if (wsdlSelectionWidget != null)
- {
- return wsdlSelectionWidget.getObjectSelectionDisplayableString();
- }
- else return "";
- }
-
- public IStructuredSelection getObjectSelection() {
- return wsdlSelectionWidget.getObjectSelection();
- }
-
- public boolean validate(String s)
- {
- return wsdlSelectionWidget.validate(s);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WebServiceClientTypeWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WebServiceClientTypeWidget.java
deleted file mode 100644
index 885f4c7..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WebServiceClientTypeWidget.java
+++ /dev/null
@@ -1,1054 +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
- * -------- -------- -----------------------------------------------------------
- * 20060407 135443 joan@ca.ibm.com - Joan Haggarty
- * 20060410 135441 joan@ca.ibm.com - Joan Haggarty
- * 20060410 136030 kathy@ca.ibm.com - Kathy Chan
- * 20060411 136167 kathy@ca.ibm.com - Kathy Chan
- * 20060417 136390 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
- * 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 137622 joan@ca.ibm.com - Joan Haggarty
- * 20060427 138058 joan@ca.ibm.com - Joan Haggarty
- * 20060504 138035 joan@ca.ibm.com - Joan Haggarty
- * 20060529 141422 kathy@ca.ibm.com - Kathy Chan
- * 20060607 144826 joan@ca.ibm.com - Joan Haggarty
- * 20060607 144049 joan@ca.ibm.com - Joan Haggarty
- * 20060614 146270 joan@ca.ibm.com - Joan Haggarty
- * 20060717 150577 makandre@ca.ibm.com - Andrew Mak
- * 20060726 150865 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060817 140017 makandre@ca.ibm.com - Andrew Mak, longer project or server/runtime strings do not resize wizard
- * 20060829 155441 makandre@ca.ibm.com - Andrew Mak, web service wizard hangs during resize
- * 20070126 138484 kathy@ca.ibm.com - Kathy Chan
- * 20071130 203826 kathy@ca.ibm.com - Kathy Chan
- * 20080205 170141 kathy@ca.ibm.com - Kathy Chan
- * 20080312 147442 trungha@ca.ibm.com - Trung Ha
- * 20080311 222103 trungha@ca.ibm.com - Trung, Changing service scale doesn't update completely non-UI part of client scale
- * 20080327 224452 trungha@ca.ibm.com - Trung Ha
- * 20080416 215084 gilberta@ca.ibm.com - Gilbert Andrews
- * 20090121 261730 zhang@ca.ibm.com - Allan Zhang, WebService client runtime id return null
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.jface.viewers.IStructuredSelection;
-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.runtime.ClientRuntimeSelectionWidgetDefaultingCommand;
-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.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.data.LabelsAndIds;
-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.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.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.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.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;
-
-
-public class WebServiceClientTypeWidget extends SimpleWidgetDataContributor implements IPackable
-{
- // INFOPOPS
- /* 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 WSWSCEN0025 for theClient Type combo box of the Scenario Page */
- private String INFOPOP_WSWSCEN_COMBO_CLIENTTYPE = "WSWSCEN0025";
- /* CONTEXT_ID WSWSCEN0026 for theClient Slider of the Scenario Page */
- private String INFOPOP_WSWSCEN_SCALE_CLIENT = "WSWSCEN0026";
-
- private String GRAPHIC_CLIENT_0="icons/client_test.jpg"; //$NON-NLS-N$
- private String GRAPHIC_CLIENT_1="icons/client_run.jpg"; //$NON-NLS-N$
- private String GRAPHIC_CLIENT_2="icons/client_install.jpg"; //$NON-NLS-N$
- private String GRAPHIC_CLIENT_3="icons/client_deploy.jpg"; //$NON-NLS-N$
- private String GRAPHIC_CLIENT_4="icons/client_assemble.jpg"; //$NON-NLS-N$
- private String GRAPHIC_CLIENT_5="icons/client_develop.jpg"; //$NON-NLS-N$
- private String GRAPHIC_CLIENT_6="icons/client_none.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 Composite clientComposite_;
- private Composite hCompClient_;
- private Shell shell_;
- private Combo clientTypeCombo_;
- private Scale clientScale_;
- private Label topologySpot_;
- private Label clientDetailsLabel_;
- private Hyperlink hLinkClientRuntime_;
- private Hyperlink hLinkClientServer_;
- private Hyperlink hLinkClientProject_;
- private Hyperlink hLinkClientEAR_;
- private ProjectSelectionDialog projectDialog_;
-
- private boolean developClient_;
- private boolean assembleClient_;
- private boolean deployClient_;
-
- private Boolean testClient_;
- private Boolean installClient_;
- private Boolean startClient_;
-
- private TypeRuntimeServer ids_;
- private IStructuredSelection objectSelection_;
- private boolean enableProxy_; //service scale is set to a level that the client scale can be enabled
- private boolean clientOnly_=false;
- private int clientScaleSetting_;
- private ImageRegistry imageReg_;
- private IProject project_;
- private WebServicesParser parser_;
- private String earProjectName_;
- private String projectName_;
- private boolean needEar_;
- private String clientComponentType_;
-
- private Listener statusListener_;
- private int validationState_;
-
- private ScaleSelectionListener scaleSelectionListener = new ScaleSelectionListener();
-
- private String CLIENT_RUNTIME_PREFIX = ConsumptionUIMessages.LABEL_RUNTIMES_LIST ;
- private String CLIENT_SERVER_PREFIX = ConsumptionUIMessages.LABEL_SERVERS_LIST;
- private String CLIENT_PROJECT_PREFIX = ConsumptionUIMessages.LABEL_CLIENT_PROJECT;
- private String CLIENT_EAR_PREFIX = ConsumptionUIMessages.LABEL_CLIENT_EAR_PROJECT;
-
- private Composite clientGroupComposite_ ;
-
- private UIUtils utils_ = new UIUtils("org.eclipse.jst.ws.consumption.ui");
- private IPackable packable_ = null;
- private LabelsAndIds labelIds_;
-
- public WebServiceClientTypeWidget(boolean clientOnly) {
- clientOnly_ = clientOnly;
- initImageRegistry();
- validationState_ = ValidationUtils.VALIDATE_ALL;
- }
-
- /**
- * Give this widget a handle to an IPackable instance, which will also be
- * packed when this widget's packIt() is called.
- *
- * @param packable The IPackable instance.
- */
- public void setPackable(IPackable packable) {
- packable_ = packable;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.consumption.ui.widgets.IPackable#packIt()
- */
- public void packIt() {
- clientGroupComposite_.pack(true);
- utils_.horizontalResize(clientGroupComposite_.getShell(), clientGroupComposite_, UIUtils.DEFAULT_PADDING);
- if (!clientOnly_ && packable_ != null)
- packable_.packIt();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#addControls(org.eclipse.swt.widgets.Composite, org.eclipse.swt.widgets.Listener)
- */
- public WidgetDataEvents addControls( Composite parent, Listener statusListener)
- {
- statusListener_ = statusListener;
- Composite clientTypeComposite = new Composite(parent, SWT.NONE);
- GridLayout cclayout = new GridLayout();
- cclayout.numColumns = 2;
- cclayout.marginTop=3;
- clientTypeComposite.setLayout( cclayout );
- GridData ccGridData = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
- clientTypeComposite.setLayoutData(ccGridData);
-
- int comboStyle = SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY;
- clientTypeCombo_ = utils_.createCombo( clientTypeComposite,
- ConsumptionUIMessages.LABEL_WEBSERVICECLIENTTYPE,
- ConsumptionUIMessages.TOOLTIP_PWPR_COMBO_CLIENTTYPE,
- INFOPOP_WSWSCEN_COMBO_CLIENTTYPE,
- comboStyle );
- GridData comboGridData = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
- clientTypeCombo_.setLayoutData(comboGridData);
- clientTypeCombo_.addSelectionListener(new SelectionListener() {
- public void widgetDefaultSelected(SelectionEvent e) {
- }
-
- public void widgetSelected(SelectionEvent e) {
- String oldTypeId = ids_.getTypeId();
- int currentSelectionIdx = clientTypeCombo_.getSelectionIndex();
- String currentTypeId = labelIds_.getIds_()[currentSelectionIdx];
- if (!oldTypeId.equals(currentTypeId)) {
- // handle changing client type
- ids_.setTypeId(currentTypeId);
- refreshServerRuntimeSelection();
- }
- validationState_ = ValidationUtils.VALIDATE_ALL;
- statusListener_.handleEvent(null);
- }
-
- });
-
- clientGroupComposite_ = new Composite(parent, SWT.NONE);
- GridLayout gclayout = new GridLayout();
- gclayout.numColumns = 2;
- gclayout.horizontalSpacing=0;
- gclayout.marginHeight=0;
- gclayout.marginBottom=5;
- clientGroupComposite_.setLayout( gclayout );
- GridData gcGridData = new GridData(SWT.BEGINNING, SWT.BEGINNING, true, true);
- clientGroupComposite_.setLayoutData(gcGridData);
-
- clientGroupComposite_.addControlListener(new ControlListener()
- {
- public void controlMoved(ControlEvent e) {
- // TODO Auto-generated method stub
-
- }
- public void controlResized(ControlEvent e) {
- clientGroupComposite_.pack(true);
- }
- });
-
-
- clientComposite_ = new Composite(clientGroupComposite_, SWT.NONE);
- GridLayout gridlayout = new GridLayout();
- gridlayout.numColumns = 2;
- gridlayout.horizontalSpacing=0;
- gridlayout.marginHeight=0;
- clientComposite_.setLayout( gridlayout );
- GridData scGridData = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- clientComposite_.setLayoutData(scGridData);
-
- clientScale_ = new Scale(clientComposite_ , SWT.VERTICAL | SWT.BORDER);
- utils_.createInfoPop(clientScale_, INFOPOP_WSWSCEN_SCALE_CLIENT);
- clientScale_.setMinimum(0);
- clientScale_.setMaximum(6);
- clientScale_.setIncrement(1);
- clientScale_.setPageIncrement(1);
- clientScale_.addSelectionListener(scaleSelectionListener);
- setClientScale(getClientGeneration());
- clientScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_CLIENT);
-
- Accessible accessibleScale = clientScale_.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_CLIENT;
- }
- });
- 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 = clientScale_.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:
- e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_DEVELOP;
- break;
- case 6:
- if (clientOnly_)
- e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_CLIENT_ONLY;
- else
- e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_CLIENT;
- 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;
- clientScale_.setLayoutData(layoutData1);
-
- topologySpot_ = new Label(clientComposite_ , SWT.CENTER | SWT.BORDER );
- topologySpot_.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
- if (clientOnly_)
- topologySpot_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_CLIENT_ONLY);
- else
- topologySpot_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_CLIENT);
-
- GridData layoutData = new GridData();
- layoutData.verticalAlignment=SWT.BEGINNING;
- layoutData.horizontalAlignment=SWT.BEGINNING;
- Rectangle topR = (imageReg_.get(GRAPHIC_CLIENT_6)).getBounds();
- layoutData.widthHint=topR.width;
- layoutData.heightHint=topR.height;
- topologySpot_.setLayoutData(layoutData);
-
- setGraphics(getClientGeneration());
-
- hCompClient_ = utils_.createComposite(clientGroupComposite_, 1);
-
- clientDetailsLabel_ = new Label(hCompClient_, SWT.NONE);
- clientDetailsLabel_.setText(ConsumptionUIMessages.LABEL_SUMMARY);
-
- hLinkClientServer_= new Hyperlink(hCompClient_, SWT.NULL);
- utils_.createInfoPop(hLinkClientServer_, INFOPOP_WSWSCEN_HYPERLINK_SERVER);
- hLinkClientServer_.setToolTipText(ConsumptionUIMessages.TOOLTIP_PWRS_TEXT_SERVER);
- hLinkClientServer_.addHyperlinkListener(new IHyperlinkListener(){
- public void linkActivated(HyperlinkEvent e){
- launchRuntimeSelectionDialog(true, true);
- }
- public void linkEntered(HyperlinkEvent e){}
- public void linkExited(HyperlinkEvent e){}
- });
-
- hLinkClientRuntime_ = new Hyperlink(hCompClient_, SWT.NULL);
- utils_.createInfoPop(hLinkClientRuntime_, INFOPOP_WSWSCEN_HYPERLINK_RUNTIME);
- hLinkClientRuntime_.setToolTipText(ConsumptionUIMessages.TOOLTIP_PWRS_TEXT_RUNTIME);
- hLinkClientRuntime_.addHyperlinkListener(new IHyperlinkListener(){
- public void linkActivated(HyperlinkEvent e){
- launchRuntimeSelectionDialog(true);
- }
- 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_CLIENT_PROJECT_SETTINGS, "",
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new ProjectSelectionWidget(true);
- }
- }));
-
- hLinkClientProject_ = new Hyperlink(hCompClient_, SWT.NULL);
- utils_.createInfoPop(hLinkClientRuntime_, INFOPOP_WSWSCEN_HYPERLINK_PROJECTS);
- hLinkClientProject_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_CLIENTPROJECT_LINK);
- hLinkClientProject_.addHyperlinkListener(new IHyperlinkListener(){
- public void linkActivated(HyperlinkEvent e){
- launchProjectDialog();
- }
- public void linkEntered(HyperlinkEvent e){}
- public void linkExited(HyperlinkEvent e){}
- });
-
- hLinkClientEAR_ = new Hyperlink(hCompClient_, SWT.NULL);
- utils_.createInfoPop(hLinkClientRuntime_, INFOPOP_WSWSCEN_HYPERLINK_PROJECTS);
- hLinkClientEAR_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_CLIENTPROJECT_LINK);
- hLinkClientEAR_.addHyperlinkListener(new IHyperlinkListener(){
- public void linkActivated(HyperlinkEvent e){
- launchProjectDialog();
- }
- public void linkEntered(HyperlinkEvent e){}
- public void linkExited(HyperlinkEvent e){}
- });
-
- hLinkClientServer_.setText(CLIENT_SERVER_PREFIX);
- hLinkClientRuntime_.setText(CLIENT_RUNTIME_PREFIX);
- hLinkClientProject_.setText(CLIENT_PROJECT_PREFIX);
- hLinkClientEAR_.setText(CLIENT_EAR_PREFIX);
-
- HyperlinkGroup serverRuntimeGroup = new HyperlinkGroup(Display.getCurrent());
- serverRuntimeGroup.add(hLinkClientServer_);
- serverRuntimeGroup.add(hLinkClientRuntime_);
- serverRuntimeGroup.add(hLinkClientProject_);
- serverRuntimeGroup.add(hLinkClientEAR_);
- serverRuntimeGroup.setHyperlinkUnderlineMode(HyperlinkSettings.UNDERLINE_ALWAYS);
-
- enableClientSlider(getGenerateProxy());
-
- return this;
- }
-
- public void enableClientSlider( boolean enable )
- {
- enableProxy_ = enable;
- clientScale_.setEnabled(enable);
- int selection = getClientGeneration();
- if (enable)
- {
- setGraphics(selection);
- }
- else
- {
- setClientScale(ScenarioContext.WS_NONE);
- updateFields(ScenarioContext.WS_NONE);
- setGraphics(ScenarioContext.WS_NONE);
- clientScale_.setBackgroundImage(null); //override background for disable to grey
- }
- showSummary(enable && (selection <= ScenarioContext.WS_DEVELOP));
- }
-
- private void updateFields(int selection) {
- setDevelopClient(selection <= ScenarioContext.WS_DEVELOP);
- setAssembleClient(selection <= ScenarioContext.WS_ASSEMBLE);
- setDeployClient(selection <= ScenarioContext.WS_DEPLOY);
- setTestClient(new Boolean(selection <= ScenarioContext.WS_TEST));
- setInstallClient(new Boolean(selection <= ScenarioContext.WS_INSTALL));
- setStartClient(new Boolean(selection <= ScenarioContext.WS_START));
- }
-
- private void showSummary(boolean show)
- {
- if (clientOnly_)
- show = true; //short circuit to eliminate flicker...
-
- hLinkClientEAR_.setVisible(show && needEar_);
- hLinkClientProject_.setVisible(show);
- hLinkClientRuntime_.setVisible(show);
- hLinkClientServer_.setVisible(show);
-
- if (show)
- {
- clientDetailsLabel_.setText(ConsumptionUIMessages.LABEL_SUMMARY);
- }
- else
- {
- if (clientOnly_)
- hCompClient_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_CLIENT_ONLY);
- else
- hCompClient_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_CLIENT);
- clientDetailsLabel_.setText(ConsumptionUIMessages.LABEL_SUMMARY_NO_CLIENT);
- }
- clientDetailsLabel_.pack(true);
- hLinkClientProject_.pack(true);
- hLinkClientEAR_.pack(true);
- packIt();
- }
-
- public void setTypeRuntimeServer( TypeRuntimeServer ids )
- {
- LabelsAndIds labelIds = WebServiceRuntimeExtensionUtils2.getClientTypeLabels();
- int selection = 0;
- String[] clientIds = labelIds.getIds_();
- String selectedId = ids.getTypeId();
-
- labelIds_ = labelIds;
- // rskreg
- clientTypeCombo_.setItems( labelIds.getLabels_() );
-
- // Now find the selected one.
- for( int index = 0; index < clientIds.length; index++ )
- {
- if( selectedId.equals( clientIds[index ]) )
- {
- selection = index;
- break;
- }
- }
-
- clientTypeCombo_.select( selection );
- ids_ = ids;
-
- if (ids_ != null)
- {
- String clientServerText = "";
- String serverId = ids_.getServerId();
- if (serverId != null && serverId.length()>0)
- {
- clientServerText = WebServiceRuntimeExtensionUtils2.getServerLabelById(serverId);
- }
- String clientRuntimeText = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(ids_.getRuntimeId());
-
- String currentServerText = hLinkClientServer_.getText();
- String currentRuntimeText = hLinkClientRuntime_.getText();
- String newServerText = CLIENT_SERVER_PREFIX + " " + clientServerText;
- String newRuntimeText = CLIENT_RUNTIME_PREFIX + " " + clientRuntimeText;
- hLinkClientServer_.setText(newServerText);
- hLinkClientRuntime_.setText(newRuntimeText);
-
- /*check to see if text has changed for server or runtime
- if so, repaint links */
- if (!newServerText.equals(currentServerText))
- {
- hLinkClientServer_.pack(true);
- packIt();
- }
-
- if (!newRuntimeText.equals(currentRuntimeText))
- {
- hLinkClientRuntime_.pack(true);
- packIt();
- }
- }
-
- 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 clientEarProjectName.
-
- ValidationUtils vu = new ValidationUtils();
- boolean oldNeedEar = getClientNeedEAR();
- boolean clientProjectOrProjectTypeNeedsEar;
-
- 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.
- clientProjectOrProjectTypeNeedsEar = vu.projectOrProjectTypeNeedsEar(getClientProjectName(),
- getClientComponentType());
- } else {
- clientProjectOrProjectTypeNeedsEar = true;
- }
-
- // boolean clientProjectOrProjectTypeNeedsEar =
- // vu.projectOrProjectTypeNeedsEar(getClientProjectName(),
- // getClientComponentType());
- if (clientProjectOrProjectTypeNeedsEar) {
- // 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 currentServerNeedsEar = vu.serverNeedsEAR(getTypeRuntimeServer().getServerId());
- if (oldNeedEar != currentServerNeedsEar) {
- // Update needEar and serviceEarProjectName.
- if (currentServerNeedsEar) {
- // Calculate a reasonable default for the Ear project name
- String earProjectName = DefaultingUtils.getDefaultEARProjectName(getClientProjectName());
- setClientNeedEAR(currentServerNeedsEar);
- setClientEarProjectName(earProjectName);
- } else {
- setClientNeedEAR(currentServerNeedsEar);
- setClientEarProjectName("");
- }
-
- }
- }
- }
-
- public TypeRuntimeServer getTypeRuntimeServer()
- {
- return ids_;
- }
-
- public boolean getGenerateProxy()
- {
- return getClientGeneration() <= ScenarioContext.WS_DEVELOP;
- }
-
- public boolean getDevelopClient() {
- return developClient_;
- }
-
- public void setDevelopClient(boolean developClient) {
- this.developClient_ = developClient;
- }
-
- public boolean getAssembleClient() {
- return assembleClient_;
- }
-
- public void setAssembleClient(boolean assembleClient) {
- this.assembleClient_ = assembleClient;
- }
-
- public boolean getDeployClient() {
- return deployClient_;
- }
-
- public void setDeployClient(boolean deployClient) {
- this.deployClient_ = deployClient;
- }
-
- public void setTestClient(Boolean value)
- {
- testClient_ = value;
- }
-
- public Boolean getTestClient()
- {
- return testClient_;
- }
-
- public Boolean getInstallClient()
- {
- return installClient_;
- }
-
- public Boolean getStartClient()
- {
- return startClient_;
- }
-
- public void setInstallClient( Boolean value )
- {
- installClient_ = value;
- }
-
- public void setStartClient( Boolean value )
- {
- startClient_ = value;
- }
-
-
- private void launchProjectDialog()
- {
- String currentProjectName = getClientProjectName();
- String currentEarProjectName = getClientEarProjectName();
- String currentProjectType = getClientComponentType();
- boolean currentNeedEar = getClientNeedEAR();
-
- projectDialog_.setProjectName(currentProjectName);
- projectDialog_.setEarProjectName(currentEarProjectName);
- projectDialog_.setNeedEAR(currentNeedEar);
- projectDialog_.setProjectComponentType(currentProjectType);
-
- 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) {
- setClientProjectName(newProjectName);
- setClientEarProjectName(newEarProjectName);
- setClientNeedEAR(newNeedEar);
- setClientComponentType(newProjectType);
- validationState_ = (new ValidationUtils()).getNewValidationState(validationState_, ValidationUtils.VALIDATE_PROJECT_CHANGES);
- statusListener_.handleEvent(null);
- }
-
- /*check to see if text has changed for project or EAR
- if so, repaint links */
- if (!newProjectName.equals(currentProjectName))
- {
- hLinkClientProject_.pack(true);
- packIt();
- }
- if (!newEarProjectName.equals(currentEarProjectName))
- {
- hLinkClientEAR_.pack(true);
- packIt();
- }
- }
- }
-
- private void launchRuntimeSelectionDialog(boolean clientContext) {
- launchRuntimeSelectionDialog(clientContext, false);
- }
-
- private void launchRuntimeSelectionDialog(boolean clientContext, boolean selectServerFirst)
- {
- TypeRuntimeServer currentClientTRS = getTypeRuntimeServer();
- RuntimeServerSelectionDialog rssd = new RuntimeServerSelectionDialog(shell_, (byte)1, getTypeRuntimeServer(), "14");
- rssd.setSelectServerFirst(selectServerFirst);
- int status = rssd.open();
- if (status == Window.OK)
- {
- TypeRuntimeServer newClientTRS = rssd.getTypeRuntimeServer();
- if (!currentClientTRS.equals(newClientTRS))
- {
- setTypeRuntimeServer(rssd.getTypeRuntimeServer());
- validationState_ = (new ValidationUtils()).getNewValidationState(validationState_, ValidationUtils.VALIDATE_SERVER_RUNTIME_CHANGES);
- statusListener_.handleEvent(null); //validate the page
- }
- }
- }
-
- //Private method should be used whenever clientScale_ setting is changed
- //instead of calling clientScale_.setSelection directly.
- private void setClientScale(int setting)
- {
- clientScale_.setSelection(setting);
- clientScaleSetting_ = setting;
- }
-
- 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_CLIENT_0, WebServiceConsumptionUIPlugin
- .getImageDescriptor(GRAPHIC_CLIENT_0));
- imageReg_.put(GRAPHIC_CLIENT_1, WebServiceConsumptionUIPlugin
- .getImageDescriptor(GRAPHIC_CLIENT_1));
- imageReg_.put(GRAPHIC_CLIENT_2, WebServiceConsumptionUIPlugin
- .getImageDescriptor(GRAPHIC_CLIENT_2));
- imageReg_.put(GRAPHIC_CLIENT_3, WebServiceConsumptionUIPlugin
- .getImageDescriptor(GRAPHIC_CLIENT_3));
- imageReg_.put(GRAPHIC_CLIENT_4, WebServiceConsumptionUIPlugin
- .getImageDescriptor(GRAPHIC_CLIENT_4));
- imageReg_.put(GRAPHIC_CLIENT_5, WebServiceConsumptionUIPlugin
- .getImageDescriptor(GRAPHIC_CLIENT_5));
- imageReg_.put(GRAPHIC_CLIENT_6, WebServiceConsumptionUIPlugin
- .getImageDescriptor(GRAPHIC_CLIENT_6));
- }
-
- private void setGraphics(int selection)
- {
- String iconImage = "";
- String topologyImage = "";
-
- switch (selection) {
- case ScenarioContext.WS_TEST:
- iconImage=ICON_SCALE_BG_0;
- topologyImage=GRAPHIC_CLIENT_0;
- clientScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_TEST);
- break;
- case ScenarioContext.WS_START:
- iconImage=ICON_SCALE_BG_1;
- topologyImage=GRAPHIC_CLIENT_1;
- clientScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_RUN);
- break;
- case ScenarioContext.WS_INSTALL:
- iconImage=ICON_SCALE_BG_2;
- topologyImage=GRAPHIC_CLIENT_2;
- clientScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_INSTALL);
- break;
- case ScenarioContext.WS_DEPLOY:
- iconImage=ICON_SCALE_BG_3;
- topologyImage=GRAPHIC_CLIENT_3;
- clientScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_DEPLOY);
- break;
- case ScenarioContext.WS_ASSEMBLE:
- iconImage=ICON_SCALE_BG_4;
- topologyImage=GRAPHIC_CLIENT_4;
- clientScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_ASSEMBLE);
- break;
- case ScenarioContext.WS_DEVELOP:
- iconImage=ICON_SCALE_BG_5;
- topologyImage=GRAPHIC_CLIENT_5;
- clientScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_DEVELOP);
- break;
- case ScenarioContext.WS_NONE:
- if (!clientOnly_)
- {
- if (enableProxy_) //if service is start or test...
- iconImage=ICON_SCALE_BG_6;
- else
- iconImage=null;
- topologyImage=GRAPHIC_CLIENT_6;
- clientScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_CLIENT);
- }
- else
- {
- setClientScale(ScenarioContext.WS_DEVELOP); //"no selection" is not allowed...must develop client @ minimum
- iconImage=ICON_SCALE_BG_5;
- topologyImage=GRAPHIC_CLIENT_5;
- clientScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_DEVELOP);
- }
- break;
- default:
- break;
- }
- clientScale_.setBackgroundImage(imageReg_.get(iconImage));
- topologySpot_.setImage(imageReg_.get(topologyImage));
- }
-
- public IStructuredSelection getObjectSelection()
- {
- return objectSelection_;
- }
-
- public void setObjectSelection(IStructuredSelection selection)
- {
- objectSelection_ = selection;
- }
-
- public int getClientGeneration()
- {
- return clientScaleSetting_;
- }
-
- public void setClientGeneration(int value)
- {
- if (clientOnly_ && value == ScenarioContext.WS_NONE) {
- value = ScenarioContext.WS_DEVELOP;
- setDevelopClient(true);
- }
-
- setClientScale(value);
-
- setGraphics(value);
- showSummary(value < ScenarioContext.WS_NONE);
- updateFields(value);
- }
-
- public void setProject(IProject project)
- {
- project_ = project;
- }
-
- public IProject getProject()
- {
- return project_;
- }
-
- public String getClientRuntimeId()
- {
- // calculate the most appropriate clientRuntimeId based on current settings.
- return WebServiceRuntimeExtensionUtils2.getClientRuntimeId(getTypeRuntimeServer(), getClientProjectName(), getClientComponentType());
-
- }
-
- public void setClientComponentType(String type)
- {
- clientComponentType_= type;
- }
-
- public String getClientComponentType()
- {
- return clientComponentType_;
- }
-
- public void setClientProjectName(String name)
- {
- projectName_ = name;
- hLinkClientProject_.setText(CLIENT_PROJECT_PREFIX + " " + projectName_);
- hLinkClientProject_.pack(true);
- packIt();
- }
-
- public String getClientProjectName()
- {
- if (projectName_ == null)
- return "";
- return projectName_;
- }
-
- public void setClientEarProjectName(String name)
- {
- earProjectName_ = name;
- refreshEARLink();
-
- }
-
- public void refreshEARLink()
- {
- hLinkClientEAR_.setVisible(needEar_ && getGenerateProxy());
- if (needEar_)
- {
- hLinkClientEAR_.setText(CLIENT_EAR_PREFIX + " " + earProjectName_);
- hLinkClientEAR_.pack(true);
- packIt();
- }
- }
-
- public String getClientEarProjectName()
- {
- if (earProjectName_ == null)
- return "";
- return earProjectName_;
- }
-
- public void setClientNeedEAR(boolean b)
- {
- needEar_ = b;
- refreshEARLink();
- }
-
- public boolean getClientNeedEAR()
- {
- return needEar_;
- }
-
- public WebServicesParser getWebServicesParser()
- {
- return parser_;
- }
-
- public void setWebServicesParser(WebServicesParser parser)
- {
- parser_ = parser;
- }
-
- //for the purposes of disabling the service implementation controls from the preferences dialog
- public void disableNonPreferenceWidgets()
- {
- if (hCompClient_ != null)
- {
- hCompClient_.setVisible(false);
- }
- }
-
- public int getValidationState()
- {
- return validationState_;
- }
-
- public void setValidationState(int state)
- {
- validationState_ = state;
- }
-
- public IStatus checkMissingFieldStatus() {
-
- ValidationUtils valUtils = new ValidationUtils();
- String runtimeId = getTypeRuntimeServer().getRuntimeId();
- String serverId = getTypeRuntimeServer().getServerId();
- String projectName = getClientProjectName();
- boolean needEar = getClientNeedEAR();
- String earProjectName = getClientEarProjectName();
- String projectTypeId = getClientComponentType();
- IStatus missingFieldStatus = valUtils.checkMissingFieldStatus(validationState_, null, null, runtimeId, serverId,
- projectName, needEar, earProjectName, projectTypeId, true);
- return missingFieldStatus;
- }
-
- public IStatus checkErrorStatus() {
-
- ValidationUtils valUtils = new ValidationUtils();
- String projectName = getClientProjectName();
- boolean needEar = getClientNeedEAR();
- String earProjectName = getClientEarProjectName();
- String projectTypeId = getClientComponentType();
- // Defect 215084 - no need to pass initial project for client scenario
- IStatus possibleErrorStatus = valUtils.checkErrorStatus(validationState_, getTypeRuntimeServer(), projectName,"", needEar, earProjectName, projectTypeId, true);
- return possibleErrorStatus;
- }
-
- public IStatus checkWarningStatus() {
- ValidationUtils valUtils = new ValidationUtils();
-
- int scaleSetting = getClientGeneration();
- String serverId = getTypeRuntimeServer().getServerId();
- IStatus warningStatus = valUtils.checkWarningStatus(validationState_, scaleSetting, serverId, getTypeRuntimeServer().getServerInstanceId(), true);
- return warningStatus;
- }
-
-
- private class ScaleSelectionListener implements SelectionListener
- {
- public void widgetSelected(SelectionEvent e) {
- int oldClientScaleSetting = clientScaleSetting_;
-
- int selection = clientScale_.getSelection();
-
- //WARNING: No scale change should be done after the line below, 'selection' might not have the correct value
- setClientGeneration(selection);
-
- //When client slider moves out of the "WS_NONE" state, VALIDATE_ALL should be done.
- //Otherwise, VALIDATE_SCALE_CHANGES is sufficient.
- if (oldClientScaleSetting==ScenarioContext.WS_NONE && clientScaleSetting_!=ScenarioContext.WS_NONE)
- {
- validationState_ = ValidationUtils.VALIDATE_ALL;
- }
- else
- {
- validationState_ = (new ValidationUtils()).getNewValidationState(validationState_, ValidationUtils.VALIDATE_SCALE_CHANGES);
- }
- statusListener_.handleEvent(null); //validate the page
- }
-
-
- public void widgetDefaultSelected(SelectionEvent e) {
- widgetSelected(e);
- }
- }
-
- private void refreshServerRuntimeSelection()
- {
- //new up ServerRuntimeSelectionWidgetDefaultingCommand
- ClientRuntimeSelectionWidgetDefaultingCommand clientRTDefaultCmd = new ClientRuntimeSelectionWidgetDefaultingCommand();
-
- //call setters of new defaulting command:
- clientRTDefaultCmd.setClientInitialSelection(getObjectSelection());
- clientRTDefaultCmd.setClientInitialProject(getProject());
- clientRTDefaultCmd.setClientTypeRuntimeServer(getTypeRuntimeServer());
- clientRTDefaultCmd.setWebServicesParser(getWebServicesParser());
- clientRTDefaultCmd.setClientEarProjectName(getClientEarProjectName());
-
- clientRTDefaultCmd.execute(null, null);
-
- //perform mappings from the defaulting command to the project settings...
- setClientProjectName(clientRTDefaultCmd.getClientProjectName());
- setClientEarProjectName(clientRTDefaultCmd.getClientEarProjectName());
- setClientComponentType(clientRTDefaultCmd.getClientComponentType());
- setTypeRuntimeServer(clientRTDefaultCmd.getClientTypeRuntimeServer());
- setClientNeedEAR(clientRTDefaultCmd.getClientNeedEAR());
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ClientWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ClientWidgetBinding.java
deleted file mode 100644
index 89e2453..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ClientWidgetBinding.java
+++ /dev/null
@@ -1,478 +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
- * -------- -------- -----------------------------------------------------------
- * 20060204 124408 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060204 121605 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060223 129020 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060406 135350 kathy@ca.ibm.com - Kathy Chan
- * 20060407 135415 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060425 138052 kathy@ca.ibm.com - Kathy Chan
- * 20060517 141880 pmoogk@ca.ibm.com - Peter Moogk
- * 20060524 142635 gilberta@ca.ibm.com - Gilbert Andrews
- * 20060529 141422 kathy@ca.ibm.com - Kathy Chan
- * 20060530 144358 kathy@ca.ibm.com - Kathy Chan
- * 20060530 141422 kathy@ca.ibm.com - Kathy Chan
- * 20060717 146332 makandre@ca.ibm.com - Andrew Mak
- * 20060728 145426 kathy@ca.ibm.com - Kathy Chan
- * 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
- * 20080325 184761 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080506 227848 makandre@ca.ibm.com - Andrew Mak, Disabled "Run on Server" checkbox is in checked state
- * 20080715 240722 makandre@ca.ibm.com - Andrew Mak, Cannot setup TCP/IP Monitor for soap12 endpoints
- * 20080722 240231 gilberta@ca.ibm.com - Gilbert Andrews
- *
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.binding;
-
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.command.CheckForServiceProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.data.EclipseIPath2URLStringTransformer;
-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.extension.PreClientInstallCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.WSDLSelectionWidgetDefaultingCommand;
-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.runtime.ClientRuntimeSelectionWidgetDefaultingCommand;
-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.WebServiceClientTestArrivalCommand;
-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.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.extensions.AssembleClientFragment;
-import org.eclipse.wst.ws.internal.extensions.DeployClientFragment;
-import org.eclipse.wst.ws.internal.extensions.DevelopClientFragment;
-import org.eclipse.wst.ws.internal.extensions.InstallClientFragment;
-import org.eclipse.wst.ws.internal.extensions.RunClientFragment;
-import org.eclipse.wst.ws.internal.monitor.GetMonitorCommand;
-
-
-public class ClientWidgetBinding implements CommandWidgetBinding
-{
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
- */
- public CommandFragmentFactory create()
- {
- return new CommandFragmentFactory()
- {
- public CommandFragment create()
- {
- return new ClientRootCommandFragment();
- }
- };
- }
-
- /* (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)
- {
- //jvh mapping for initialselection????
-
- // Before ClientWizardWidget
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientWizardWidget.class);
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "InstallClient", ClientWizardWidget.class );
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "TestService", ClientWizardWidget.class );
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "MonitorService", ClientWizardWidget.class);
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ClientGeneration", ClientWizardWidget.class );
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ResourceContext", ClientWizardWidget.class );
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "DevelopClient", ClientWizardWidget.class);
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "AssembleClient", ClientWizardWidget.class);
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "DeployClient", ClientWizardWidget.class);
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "StartClient", ClientWizardWidget.class);
-
- // After ClientWizardWidget
- dataRegistry.addMapping(ClientWizardWidget.class, "ClientTypeRuntimeServer", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientWizardWidget.class, "InstallClient", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientWizardWidget.class, "TestService", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientWizardWidget.class, "MonitorService", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientWizardWidget.class, "ResourceContext", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientWizardWidget.class, "ClientProjectName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientWizardWidget.class, "DevelopClient", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientWizardWidget.class, "AssembleClient", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientWizardWidget.class, "DeployClient", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientWizardWidget.class, "StartClient", ClientWizardWidgetOutputCommand.class);
-
- //jvh added..
- dataRegistry.addMapping(ClientWizardWidget.class, "Project", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientWizardWidget.class, "WebServicesParser", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientWizardWidget.class, "WsdlURI", ClientWizardWidgetOutputCommand.class);
-
- //jvh - rerouted the defaulting command to the ClientWizardWidget
- // Before ClientRuntimeSelectionWidget
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientWizardWidget.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", ClientWizardWidget.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", ClientWizardWidget.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentType", ClientWizardWidget.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientNeedEAR", ClientWizardWidget.class);
-
- //jvh - rerouted from ClientWizardWidget instead of runtimeserverwidget- add getters to ClientWizardWidget for them
- // After ClientRuntimeSelectionWidget
- dataRegistry.addMapping(ClientWizardWidget.class, "ClientTypeRuntimeServer", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientWizardWidget.class, "ClientRuntimeId", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientWizardWidget.class, "ClientProjectName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientWizardWidget.class, "ClientEarProjectName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientWizardWidget.class, "ClientComponentType", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientWizardWidget.class, "ClientNeedEAR", ClientExtensionDefaultingCommand.class);
-
- // Before WSDLSelectionWidgetWrapper
- // jvh - rerouted these to ClientWizardWidget
- dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "WebServiceURI", ClientWizardWidget.class );
- dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "Project", ClientWizardWidget.class );
- dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "ComponentName", ClientWizardWidget.class );
-
-/* // After WSDLSelectionWidgetWrapper
- //jvh - reroute these from the dialog to ClientWizardWidget - call setters on the other dialogs...
- dataRegistry.addMapping(WSDLSelectionWidgetWrapper.class, "WsdlURI", WSDLSelectionOutputCommand.class);
- dataRegistry.addMapping(WSDLSelectionWidgetWrapper.class, "WebServicesParser", WSDLSelectionOutputCommand.class);
- dataRegistry.addMapping(WSDLSelectionWidgetWrapper.class, "Project", WSDLSelectionOutputCommand.class);
- dataRegistry.addMapping(WSDLSelectionWidgetWrapper.class, "ComponentName", WSDLSelectionOutputCommand.class);
-*/
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "GenerateProxy",TestDefaultingFragment.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientRuntimeId",TestDefaultingFragment.class);
-
- // Before Client Test widget.
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService",FinishTestFragment.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestWidget.class );
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "RunTestClient", ClientTestWidget.class );
- dataRegistry.addMapping(PreClientInstallCommand.class, "CanRunTestClient", ClientTestWidget.class );
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientTestWidget.class );
- 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, "RunTestClient",ClientTestWidget.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Methods",ClientTestWidget.class);
-
- // After the client test widget
- 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, "CanRunTestClient",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);
- }
-
- /* (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( "ClientWizardWidget",
- ConsumptionUIMessages.PAGE_TITLE_WS_PROJECT,
- ConsumptionUIMessages.PAGE_DESC_WS_CLIENT,
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new ClientWizardWidget();
- }
- } );
-
- //jvh
- /*widgetRegistry.add( "ClientRuntimeSelectionWidget",
- ConsumptionUIMessages.PAGE_TITLE_WS_CLIENT_RUNTIME_SELECTION,
- ConsumptionUIMessages.PAGE_DESC_WS_CLIENT_RUNTIME_SELECTION,
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new ClientRuntimeSelectionWidget();
- }
- } );*/
-
- //jvh
- /*widgetRegistry.add( "WSDLSelectionWidgetWrapper",
- ConsumptionUIMessages.PAGE_TITLE_WS_SELECTION,
- ConsumptionUIMessages.PAGE_DESC_WS_SELECTION,
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new WSDLSelectionWidgetWrapper();
- }
- } );*/
-
- widgetRegistry.add( "ClientTestWidget",
- ConsumptionUIMessages.PAGE_TITLE_WS_SAMPLE,
- ConsumptionUIMessages.PAGE_DESC_WS_SAMPLE,
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new ClientTestWidget();
- }
- });
- }
-
- private class ClientRootCommandFragment extends SequenceFragment
- {
- public ClientRootCommandFragment()
- {
- add( new SimpleFragment( new ScenarioCleanupCommand(), "" ));
-
- //add( new SimpleFragment( new CheckForMissingFiles(), "" ) );
- add( new SimpleFragment( new ClientWizardWidgetDefaultingCommand(true), "" ) );
- add( new SimpleFragment( new WSDLSelectionWidgetDefaultingCommand(), "")); //jvh moved this up
- add( new SimpleFragment( new ClientRuntimeSelectionWidgetDefaultingCommand(), "")); //jvh moved this up
- add( new SimpleFragment( "ClientWizardWidget" ) );
- //add( new TestCommandFactoryFragment() );
- add( new SimpleFragment( new ClientWizardWidgetOutputCommand(), "" ));
-
- //add( new TestCommandFactoryFragment2() );
- //add( new SimpleFragment( new CheckForServiceProjectCommand(), ""));
- add( new SimpleFragment( new ClientExtensionDefaultingCommand( true ), ""));
- //add(new SimpleFragment(new ClientServerDeployableConfigCommand(false), "")); //Note: added here for client
- //add( new ClientExtensionFragment() );
- add( new ClientRootFragment() );
- add( new SimpleFragment( new ClientExtensionOutputCommand(), "" ) );
- add( new SimpleFragment(new GetMonitorCommand(), ""));
- add( new SimpleFragment(new TestDefaultingFragment(),""));
- add( new ClientTestFragment( "ClientTestWidget") );
- 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)
- {
- //Map SelectionCommand
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientRuntimeSelectionWidgetDefaultingCommand.class, "InitialInitialSelection", null);
-
- // Map ClientWizardWidgetDefaultingCommand command.
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "InstallClient", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "TestService", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "RunTestClient", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "MonitorService", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ResourceContext", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "DevelopClient", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "AssembleClient", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "DeployClient", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "StartClient", ClientWizardWidgetOutputCommand.class);
-
-
- // Map ClientWizardWidgetOutputCommand command.
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ResourceContext", ClientRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "InstallClient", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "RunTestClient", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "TestService", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "TestService", ClientRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "StartClient", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "DevelopClient", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "AssembleClient", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "DeployClient", ClientExtensionDefaultingCommand.class);
-
-
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "ResourceContext", ClientRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "ResourceContext", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "MonitorService", GetMonitorCommand.class);
-
- // Map ClientRuntimeSelectionWidgetDefaultingCommand command
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientRuntimeId", ClientExtensionDefaultingCommand.class);
- //dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "Runtime2ClientTypes", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", ClientExtensionDefaultingCommand.class);
- //dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", ClientExtensionDefaultingCommand.class);
- //dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentType", ClientExtensionDefaultingCommand.class);
- //dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientJ2EEVersion", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientNeedEAR", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", CheckForServiceProjectCommand.class);
-
- // Map WSDLSelectionWidgetDefaultingCommand command.
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", WSDLSelectionWidgetDefaultingCommand.class );
- dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "Project", ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialProject", null);
- dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "WebServiceURI", ClientRuntimeSelectionWidgetDefaultingCommand.class, "WsdlURI", new EclipseIPath2URLStringTransformer());
-
- dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "GenWSIL", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "WsilURI", ClientExtensionDefaultingCommand.class);
- //jvh - rerouted these to the ClientWizardWidgetOutputCommand
- dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "WebServiceURI", ClientWizardWidgetOutputCommand.class, "WsdlURI", new EclipseIPath2URLStringTransformer());
- dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "Project", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "ComponentName", ClientWizardWidgetOutputCommand.class);
-
- // WSDLSelectionOutputCommand
- //jvh - rerouted these from ClientWizardWidgetOutputCommand
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "WsdlURI", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "WebServicesParser", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "WsdlURI", GetMonitorCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "WebServicesParser", GetMonitorCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "WsdlURI", CheckForServiceProjectCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "WebServicesParser", CheckForServiceProjectCommand.class);
-
-
- //jvh - add code to widget so that the appropriate sets happen and defaulting occurs again after object selection
- /*dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "Project", ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialProject", null);
- dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WsdlURI", ClientRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WebServicesParser", ClientRuntimeSelectionWidgetDefaultingCommand.class);*/
-
- // Setup the PreClientDevelopCommand.
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "DeployClient", PreClientDevelopCommand.class);
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "InstallClient", PreClientDevelopCommand.class);
-
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "DevelopClient", PreClientDevelopCommand.class);
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "AssembleClient", PreClientDevelopCommand.class);
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "StartClient", PreClientDevelopCommand.class, "StartService", null);
-
-
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "TestService", PreClientDevelopCommand.class);
- dataRegistry.addMapping( ClientWizardWidgetOutputCommand.class, "ResourceContext", PreClientDevelopCommand.class);
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", 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( ClientWizardWidgetOutputCommand.class, "ResourceContext", PreClientDevelopCommand.class);
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "WsdlURI", PreClientDevelopCommand.class );
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientRuntimeId", PreClientDevelopCommand.class );
-
- dataRegistry.addMapping( PreClientDevelopCommand.class, "WebService", ClientExtensionOutputCommand.class, "WebServiceClient", null );
-
- // Map ClientExtensionDefaultingCommand command.
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionFragment.class);
-
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", WebServiceClientTestArrivalCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", WebServiceClientTestArrivalCommand.class);
-
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "GenerateProxy", ClientTestFragment.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestFragment.class );
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ProxyBean", ClientTestFragment.class );
-
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientNeedEAR", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientEarProjectName", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientEarProjectName", ClientTestDelegateCommand.class,"ClientEarComponentName", null);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "RunTestClient",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServer", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "WsdlURI", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "CanRunTestClient", ClientTestDelegateCommand.class );
-
- // Map ClientExtensionOutputCommand command.
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", WebServiceClientTestArrivalCommand.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyEndpoint", GetMonitorCommand.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "CanGenerateProxy", ClientTestFragment.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "CanGenerateProxy", FinishTestFragment.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "SetEndpointMethod", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ServerInstanceId", FinishDefaultCommand.class);
-
- dataRegistry.addMapping(PreClientInstallCommand.class, "CanRunTestClient", ClientTestDelegateCommand.class );
-
- // GetMonitorCommand
- dataRegistry.addMapping(GetMonitorCommand.class, "Endpoints", ClientTestDelegateCommand.class);
-
- // MAP post server config call
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", ClientExtensionOutputCommand.class, "EarProjectName", null);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServerInstance", ClientExtensionOutputCommand.class, "ExistingServerId", null);
-
- // Map WebServiceClientTestArrivalCommand command.
- dataRegistry.addMapping(TestDefaultingFragment.class, "TestFacility",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.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);
-
-
- //Mappings to enable peek-ahead for Page 3 of the client wizard
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "WebService", DevelopClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Environment", DevelopClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Context", DevelopClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Selection", DevelopClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", DevelopClientFragment.class, "Project", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", DevelopClientFragment.class, "Module", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", DevelopClientFragment.class, "EarProject", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", DevelopClientFragment.class, "Ear", null );
-
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "WebService", AssembleClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Environment", AssembleClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Context", AssembleClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Selection", AssembleClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", AssembleClientFragment.class, "Project", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", AssembleClientFragment.class, "Module", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", AssembleClientFragment.class, "EarProject", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", AssembleClientFragment.class, "Ear", null );
-
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "WebService", DeployClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Environment", DeployClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Context", DeployClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Selection", DeployClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", DeployClientFragment.class, "Project", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", DeployClientFragment.class, "Module", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", DeployClientFragment.class, "EarProject", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", DeployClientFragment.class, "Ear", null );
-
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "WebService", InstallClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Environment", InstallClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Context", InstallClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Selection", InstallClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", InstallClientFragment.class, "Project", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", InstallClientFragment.class, "Module", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", InstallClientFragment.class, "EarProject", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", InstallClientFragment.class, "Ear", null );
-
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "WebService", RunClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Environment", RunClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Context", RunClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Selection", RunClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", RunClientFragment.class, "Project", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", RunClientFragment.class, "Module", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", RunClientFragment.class, "EarProject", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", RunClientFragment.class, "Ear", null );
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigClientHandlersWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigClientHandlersWidgetBinding.java
deleted file mode 100644
index 16b3fa8..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigClientHandlersWidgetBinding.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
- * -------- -------- -----------------------------------------------------------
- * 20060404 134913 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060517 142339 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.binding;
-
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.command.GenerateHandlerSkeletonCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.OpenJavaEditorCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientHandlersWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientHandlersWidgetOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ConfigClientHandlersTableWidget;
-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.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;
-
-
-/**
- *
- * Handler Configuration Window - Preferences - Java - Code Generation - Code
- * and Comments
- */
-public class ConfigClientHandlersWidgetBinding implements CommandWidgetBinding
-{
-
- /*
- * (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("ConfigClientHandlersTableWidget",
- ConsumptionUIMessages.PAGE_TITLE_CLIENT_HDLR_CONFIG,
- ConsumptionUIMessages.PAGE_DESC_CLIENT_HDLR_CONFIG,
- new WidgetContributorFactory() {
-
- public WidgetContributor create() {
- return new ConfigClientHandlersTableWidget();
- }
- });
-
- }
-
- /*
- * (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) {
-
- // widget
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"HandlerServiceRefHolder", ConfigClientHandlersTableWidget.class);
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"IsMultipleSelection", ConfigClientHandlersTableWidget.class);
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"GenSkeletonEnabled", ConfigClientHandlersTableWidget.class);
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"ServiceRefName", ConfigClientHandlersTableWidget.class);
-
- // output
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"IsMultipleSelection", ClientHandlersWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"ClientProject", ClientHandlersWidgetOutputCommand.class);
- dataRegistry.addMapping(ConfigClientHandlersTableWidget.class,"HandlerServiceRefHolder", ClientHandlersWidgetOutputCommand.class);
-
- // gen skeleton
- dataRegistry.addMapping(ConfigClientHandlersTableWidget.class,"HandlerServiceRefHolder", GenerateHandlerSkeletonCommand.class);
- dataRegistry.addMapping(ConfigClientHandlersTableWidget.class,"GenSkeletonEnabled", GenerateHandlerSkeletonCommand.class);
-
- // open in editor
- dataRegistry.addMapping(GenerateHandlerSkeletonCommand.class,"Project", OpenJavaEditorCommand.class);
- dataRegistry.addMapping(GenerateHandlerSkeletonCommand.class,"ClassNames", OpenJavaEditorCommand.class);
- dataRegistry.addMapping(ConfigClientHandlersTableWidget.class,"GenSkeletonEnabled", OpenJavaEditorCommand.class,"IsEnabled", null);
-
- }
-
- /*
- * (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.internal.env.core.fragment.CommandFragmentFactoryFactory#create()
- */
- public CommandFragmentFactory create() {
- return new CommandFragmentFactory() {
-
- public CommandFragment create() {
-
- return new ClientHandlersConfigCommandFragment();
- }
- };
- }
-
- private class ClientHandlersConfigCommandFragment extends SequenceFragment{
-
- public ClientHandlersConfigCommandFragment()
- {
- add( new SimpleFragment( new ClientHandlersWidgetDefaultingCommand(), "" ));
- add( new SimpleFragment( "ConfigClientHandlersTableWidget" ) );
- add( new SimpleFragment( new ClientHandlersWidgetOutputCommand(), "" ));
- add( new SimpleFragment( new GenerateHandlerSkeletonCommand(), ""));
- add( new SimpleFragment( new OpenJavaEditorCommand(), ""));
- }
-
- /* (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)
- {
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientHandlersWidgetDefaultingCommand.class);
-
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"WsServiceRefs", ClientHandlersWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"ClientProject", ClientHandlersWidgetOutputCommand.class);
- }
-
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigServiceHandlersWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigServiceHandlersWidgetBinding.java
deleted file mode 100644
index c7b7c7a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigServiceHandlersWidgetBinding.java
+++ /dev/null
@@ -1,139 +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
- * -------- -------- -----------------------------------------------------------
- * 20060404 134913 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.binding;
-
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.command.GenerateHandlerSkeletonCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.OpenJavaEditorCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ConfigServiceHandlersTableWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ServiceHandlersWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ServiceHandlersWidgetOutputCommand;
-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.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;
-
-
-/**
- *
- * Handler Configuration Window - Preferences - Java - Code Generation - Code
- * and Comments
- */
-public class ConfigServiceHandlersWidgetBinding implements CommandWidgetBinding {
-
- /*
- * (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("ConfigServiceHandlersTableWidget",
- ConsumptionUIMessages.PAGE_TITLE_SERVICE_HDLR_CONFIG,
- ConsumptionUIMessages.PAGE_DESC_SERVICE_HDLR_CONFIG,
- new WidgetContributorFactory() {
-
- public WidgetContributor create() {
- return new ConfigServiceHandlersTableWidget();
- }
- });
-
- }
-
- /*
- * (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) {
-
- // widget
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"HandlerDescriptionHolders", ConfigServiceHandlersTableWidget.class);
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "IsMultipleSelection", ConfigServiceHandlersTableWidget.class);
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"GenSkeletonEnabled", ConfigServiceHandlersTableWidget.class);
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"DescriptionName", ConfigServiceHandlersTableWidget.class);
-
- // output command (adds/removes from model)
- dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class,"HandlerDescriptionHolders", ServiceHandlersWidgetOutputCommand.class);
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "IsMultipleSelection", ServiceHandlersWidgetOutputCommand.class);
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"WsddResource", ServiceHandlersWidgetOutputCommand.class);
-
- // gen skeleton command
- dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class,"HandlerDescriptionHolders", GenerateHandlerSkeletonCommand.class);
- dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class,"GenSkeletonEnabled", GenerateHandlerSkeletonCommand.class);
-
- // open Java editor
- dataRegistry.addMapping(GenerateHandlerSkeletonCommand.class,"Project", OpenJavaEditorCommand.class);
- dataRegistry.addMapping(GenerateHandlerSkeletonCommand.class,"ClassNames", OpenJavaEditorCommand.class);
- dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class,"GenSkeletonEnabled", OpenJavaEditorCommand.class,"IsEnabled", null);
- }
-
- /*
- * (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.internal.env.core.fragment.CommandFragmentFactoryFactory#create()
- */
- public CommandFragmentFactory create() {
- return new CommandFragmentFactory() {
-
- public CommandFragment create() {
-
- return new ServiceHandlersConfigCommandFragment();
- }
- };
- }
-
- private class ServiceHandlersConfigCommandFragment extends SequenceFragment{
-
- public ServiceHandlersConfigCommandFragment()
- {
- add( new SimpleFragment( new ServiceHandlersWidgetDefaultingCommand(), "" ));
- add( new SimpleFragment( "ConfigServiceHandlersTableWidget" ) );
- add( new SimpleFragment( new ServiceHandlersWidgetOutputCommand(), "" ));
- add( new SimpleFragment( new GenerateHandlerSkeletonCommand(), ""));
- add( new SimpleFragment( new OpenJavaEditorCommand(), ""));
-
- }
-
- /* (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)
- {
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ServiceHandlersWidgetDefaultingCommand.class);
-
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "WsddResource", ServiceHandlersWidgetOutputCommand.class);
-
-
- }
-
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigureHandlersWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigureHandlersWidgetBinding.java
deleted file mode 100644
index 53969b4..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigureHandlersWidgetBinding.java
+++ /dev/null
@@ -1,256 +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
- * -------- -------- -----------------------------------------------------------
- * 20060404 134913 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.binding;
-
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.command.GenerateHandlerSkeletonCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.OpenJavaEditorCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientHandlersWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientHandlersWidgetOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ConfigClientHandlersTableWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ConfigServiceHandlersTableWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.HandlersDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ServiceHandlersWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ServiceHandlersWidgetOutputCommand;
-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;
-
-
-public class ConfigureHandlersWidgetBinding implements CommandWidgetBinding {
-
-
- public ConfigureHandlersWidgetBinding() {
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
- */
- public CommandFragmentFactory create() {
- return new CommandFragmentFactory() {
-
- public CommandFragment create() {
- return new HandlersCommandFragment();
- }
- };
- }
-
- /*
- * (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) {
-
- // Map client-side widgets to commands
- // widget
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"HandlerServiceRefHolder", ConfigClientHandlersTableWidget.class);
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"IsMultipleSelection", ConfigClientHandlersTableWidget.class);
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"GenSkeletonEnabled", ConfigClientHandlersTableWidget.class);
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"ServiceRefName", ConfigClientHandlersTableWidget.class);
-
- // output
-
- dataRegistry.addMapping(ConfigClientHandlersTableWidget.class,"HandlerServiceRefHolder", ClientHandlersWidgetOutputCommand.class);
-
- // gen skeleton
- dataRegistry.addMapping(ConfigClientHandlersTableWidget.class,"HandlerServiceRefHolder", GenerateHandlerSkeletonCommand.class);
- dataRegistry.addMapping(ConfigClientHandlersTableWidget.class,"GenSkeletonEnabled", GenerateHandlerSkeletonCommand.class);
-
- // open in editor
- dataRegistry.addMapping(ConfigClientHandlersTableWidget.class,"GenSkeletonEnabled", OpenJavaEditorCommand.class,"IsEnabled", null);
-
-
- // Map service-side widgets to commands
- // widget
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"HandlerDescriptionHolders", ConfigServiceHandlersTableWidget.class);
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "IsMultipleSelection", ConfigServiceHandlersTableWidget.class);
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"GenSkeletonEnabled", ConfigServiceHandlersTableWidget.class);
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"DescriptionName", ConfigServiceHandlersTableWidget.class);
-
- // output command (adds/removes from model)
- dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class,"HandlerDescriptionHolders", ServiceHandlersWidgetOutputCommand.class);
-
-
- // gen skeleton command
- dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class,"HandlerDescriptionHolders", GenerateHandlerSkeletonCommand.class);
- dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class,"GenSkeletonEnabled", GenerateHandlerSkeletonCommand.class);
-
- // open Java editor
- dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class,"GenSkeletonEnabled", OpenJavaEditorCommand.class,"IsEnabled", 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("ConfigServiceHandlersTableWidget", ConsumptionUIMessages.PAGE_TITLE_SERVICE_HDLR_CONFIG,
- ConsumptionUIMessages.PAGE_DESC_SERVICE_HDLR_CONFIG, new WidgetContributorFactory() {
-
- public WidgetContributor create() {
- return new ConfigServiceHandlersTableWidget();
- }
- });
-
- widgetRegistry.add("ConfigClientHandlersTableWidget", ConsumptionUIMessages.PAGE_TITLE_CLIENT_HDLR_CONFIG,
- ConsumptionUIMessages.PAGE_DESC_CLIENT_HDLR_CONFIG, new WidgetContributorFactory() {
-
- public WidgetContributor create() {
- return new ConfigClientHandlersTableWidget();
- }
- });
-
- }
-
- private class HandlersCommandFragment extends SequenceFragment {
-
- public HandlersCommandFragment() {
-
- add(new SimpleFragment(new HandlersDefaultingCommand(), ""));
-
- add(new ServiceHandlersFragment());
- add(new ClientHandlersFragment());
- }
-
- public void registerDataMappings(DataMappingRegistry dataRegistry) {
-
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", HandlersDefaultingCommand.class);
-
- dataRegistry.addMapping(HandlersDefaultingCommand.class, "IsClientHandler", ClientHandlersFragment.class, "ClientHandlersEnabled", null);
- dataRegistry.addMapping(HandlersDefaultingCommand.class, "IsServiceHandler", ServiceHandlersFragment.class, "ServiceHandlersEnabled", null);
-
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"IsMultipleSelection", ClientHandlersWidgetOutputCommand.class);
- dataRegistry.addMapping(GenerateHandlerSkeletonCommand.class,"Project", OpenJavaEditorCommand.class);
- dataRegistry.addMapping(GenerateHandlerSkeletonCommand.class,"ClassNames", OpenJavaEditorCommand.class);
-
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "IsMultipleSelection", ServiceHandlersWidgetOutputCommand.class);
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"WsddResource", ServiceHandlersWidgetOutputCommand.class);
- dataRegistry.addMapping(GenerateHandlerSkeletonCommand.class,"Project", OpenJavaEditorCommand.class);
- dataRegistry.addMapping(GenerateHandlerSkeletonCommand.class,"ClassNames", OpenJavaEditorCommand.class);
-
- }
-
- public void registerCanFinish(CanFinishRegistry canFinishRegistry) {
- }
- }
-
- private class ClientHandlersFragment extends BooleanFragment {
-
- boolean isClient_ = false;
-
- public ClientHandlersFragment() {
- setCondition(new Condition() {
-
- public boolean evaluate() {
- return isClient_;
- }
- });
-
- SequenceFragment clientHandlersRootFragment = new SequenceFragment();
-
- clientHandlersRootFragment.add(new SimpleFragment(new ClientHandlersWidgetDefaultingCommand(), ""));
-
- clientHandlersRootFragment.add(new SimpleFragment("ConfigClientHandlersTableWidget"));
- clientHandlersRootFragment.add(new SimpleFragment(new ClientHandlersWidgetOutputCommand(), ""));
- clientHandlersRootFragment.add(new SimpleFragment(new GenerateHandlerSkeletonCommand(), ""));
-
- setTrueFragment(clientHandlersRootFragment);
- }
-
- public void setClientHandlersEnabled(boolean isClient) {
- isClient_ = isClient;
- }
-
- /*
- * (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) {
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientHandlersWidgetDefaultingCommand.class);
-
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class, "ClientProject", ClientHandlersWidgetOutputCommand.class);
-
- }
-
- }
-
- private class ServiceHandlersFragment extends BooleanFragment {
-
- boolean isService_ = false;
-
- public ServiceHandlersFragment() {
- setCondition(new Condition() {
-
- public boolean evaluate() {
- return isService_;
- }
- });
-
- SequenceFragment serviceHandlersRootFragment = new SequenceFragment();
- serviceHandlersRootFragment.add(new SimpleFragment(new ServiceHandlersWidgetDefaultingCommand(), ""));
-
- SequenceFragment serviceHandlersFragment = new SequenceFragment();
- serviceHandlersFragment.add(new SimpleFragment("ConfigServiceHandlersTableWidget"));
- serviceHandlersFragment.add(new SimpleFragment(new ServiceHandlersWidgetOutputCommand(), ""));
- serviceHandlersFragment.add(new SimpleFragment(new GenerateHandlerSkeletonCommand(), ""));
-
- serviceHandlersRootFragment.add(serviceHandlersFragment);
-
- setTrueFragment(serviceHandlersRootFragment);
- }
-
- public void setServiceHandlersEnabled(boolean isService) {
- isService_ = isService;
- }
-
- /*
- * (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) {
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ServiceHandlersWidgetDefaultingCommand.class);
-
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "WsddResource", ServiceHandlersWidgetOutputCommand.class);
-
- }
-
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/GenSampleWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/GenSampleWidgetBinding.java
deleted file mode 100644
index ed9a14e..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/GenSampleWidgetBinding.java
+++ /dev/null
@@ -1,493 +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
- * -------- -------- -----------------------------------------------------------
- * 20060524 142635 gilberta@ca.ibm.com - Gilbert Andrews
- * 20060529 141422 kathy@ca.ibm.com - Kathy Chan
- * 20060608 145529 kathy@ca.ibm.com - Kathy Chan
- * 20060717 146332 makandre@ca.ibm.com - Andrew Mak
- * 20070516 186233 gilberta@ca.ibm.com - Gilbert Andrews
- * 20070815 199626 kathy@ca.ibm.com - Kathy Chan
- * 20080325 184761 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080331 224953 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080415 227237 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080425 221232 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080616 237298 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080619 237797 gilberta@ca.ibm.com - Gilbert Andrews
- * 20090324 247535 mahutch@ca.ibm.com - Mark Hutchinson, Wrong server instance(s) is chosen during JAX-RPC sample generation
- * 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.consumption.ui.widgets.binding;
-
-import java.util.ArrayList;
-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.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.IStructuredSelection;
-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.jst.ws.internal.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.command.common.AddModuleToServerCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateServerCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.command.data.EclipseIPath2URLStringTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.common.FinishFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.WSDLSelectionWidgetDefaultingCommand;
-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.runtime.ClientRuntimeSelectionWidgetDefaultingCommand;
-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.TestWebServiceClient;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WebServiceClientTestArrivalCommand;
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-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.context.ResourceContext;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-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.core.selection.SelectionList;
-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.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceClientInfo;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceState;
-
-
-public class GenSampleWidgetBinding implements CommandWidgetBinding
-{
-
-
-
-/* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
- */
- public CommandFragmentFactory create()
- {
- return new CommandFragmentFactory()
- {
- public CommandFragment create()
- {
- return new GenSampleRootCommandFragment();
- }
- };
- }
-
- public SelectionList getLegitTestFacility()
- {
- ScenarioContext scenarioContext = WebServicePlugin.getInstance().getScenarioContext().copy();
- String[] testTypes = scenarioContext.getWebServiceTestTypes();
- List newTestTypes = new ArrayList();
-
- for(int i = 0;i<testTypes.length;i++){
- WebServiceTestExtension extension =
- (WebServiceTestExtension) WebServiceTestRegistry.getInstance()
- .getWebServiceExtensionsByName(testTypes[i]);
-
- if(extension.testJavaProxy()){
- boolean defaultJaxrpc = extension.isDefaultJAXRPC();
- if(defaultJaxrpc){
- newTestTypes.add(testTypes[i]);
- }
- }
- }
- String[] tempArray = new String[newTestTypes.size()];
- return new SelectionList((String[]) newTestTypes.toArray(tempArray), 0);
- }
-
- /* (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)
- {
- // Before Client Test widget.
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService",FinishTestFragment.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestWidget.class );
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "RunTestClient", ClientTestWidget.class );
- dataRegistry.addMapping(InitializeProxyCommand.class, "CanRunTestClient", ClientTestWidget.class );
- dataRegistry.addMapping(InitializeProxyCommand.class, "IsWebProject", ClientTestWidget.class );
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientTestWidget.class );
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProject", ClientTestWidget.class );
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProjectEAR", ClientTestWidget.class );
- dataRegistry.addMapping(InitializeProxyCommand.class, "TestFacility",ClientTestWidget.class);
- dataRegistry.addMapping(InitializeProxyCommand.class, "Popup",ClientTestWidget.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Folder",ClientTestWidget.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "JspFolder",ClientTestWidget.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Methods",ClientTestWidget.class);
-
- // After the client test widget
- dataRegistry.addMapping(ClientTestWidget.class, "SampleProjectEAR",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientTestWidget.class, "SampleProject",ClientTestDelegateCommand.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);
- dataRegistry.addMapping(ClientTestWidget.class, "ServerInstanceId", FinishDefaultCommand.class);
- dataRegistry.addMapping(ClientTestWidget.class, "ExistingServerId", FinishDefaultCommand.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( "ClientTestWidget",
- ConsumptionUIMessages.PAGE_TITLE_WS_SAMPLE,
- ConsumptionUIMessages.PAGE_DESC_WS_SAMPLE,
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new ClientTestWidget();
- }
- });
- }
-
- private class InitializeProxyCommand extends AbstractDataModelOperation
- {
- private IStructuredSelection selection_;
- private TypeRuntimeServer typeRuntimeServer_;
- private String project_;
- private String module_;
-// private String earProject_;
- private String ear_;
- private IWebServiceClient webServiceClient_;
- private String wsdlURI_;
- private boolean canRunTestClient_;
- private boolean isWebProject = false;
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
- IStatus status = Status.OK_STATUS;
-
- // 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);
- }
- }
-
- IProject project = ProjectUtilities.getProject(project_);
- WebServiceClientInfo clientInfo = new WebServiceClientInfo();
- clientInfo.setImplURL(getProxyBean());
- //clientInfo.setJ2eeLevel(j2eeLevel_);
- clientInfo.setServerFactoryId(typeRuntimeServer_.getServerId());
- clientInfo.setServerInstanceId(typeRuntimeServer_.getServerInstanceId());
- clientInfo.setState(WebServiceState.UNKNOWN_LITERAL);
- clientInfo.setWebServiceRuntimeId(typeRuntimeServer_.getRuntimeId());
- clientInfo.setWsdlURL(wsdlURI_);
- /*
- if (clientInfo.getServerInstanceId()==null)
- {
- CreateServerCommand createServerCommand = new CreateServerCommand();
- createServerCommand.setServerFactoryid(clientInfo.getServerFactoryId());
- createServerCommand.setEnvironment( env );
- IStatus createServerStatus = createServerCommand.execute( null, null );
- if (createServerStatus.getSeverity()==Status.OK){
- clientInfo.setServerInstanceId(createServerCommand.getServerInstanceId());
- clientInfo.setServerCreated(true);
- canRunTestClient_ = true;
- }
- else if (createServerStatus.getSeverity()==Status.ERROR){
- if(J2EEUtils.isWebComponent(project))
- canRunTestClient_ = false;
- else
- canRunTestClient_ = true;
- }
- }
- else {
- canRunTestClient_ = true;
- }*/
-
- canRunTestClient_ = true;
- IProject[] earproject = J2EEProjectUtilities.getReferencingEARProjects(project);
- boolean earNull = false;
- if (earproject.length<1) earNull = true;
-
- boolean j2eeProject = J2EEProjectUtilities.isJEEProject(project);
- if(J2EEUtils.isWebComponent(project))
- isWebProject = true;
-
- if (j2eeProject && earNull)
- canRunTestClient_ = false;
- /*
- if (!earNull && clientInfo.getServerInstanceId() != null){
-
- AddModuleToServerCommand command = new AddModuleToServerCommand();
- command.setServerInstanceId(clientInfo.getServerInstanceId());
- command.setProject(project_);
- command.setModule(module_);
- command.setEnvironment( env );
- status = command.execute( monitor, null );
- if (status.getSeverity()==Status.ERROR)
- {
- env.getStatusHandler().reportError(status);
- }
- }*/
- webServiceClient_ = new TestWebServiceClient(clientInfo);
- return status;
- }
-
- public boolean getPopup(){
- return true;
- }
-
- public String getProxyBean()
- {
- String proxyBean = "";
- try
- {
- IResource resource = ResourceUtils.getResourceFromSelection( selection_.getFirstElement() );
- String beanPackage = ResourceUtils.getJavaResourcePackageName( resource.getFullPath() );
-
- if( beanPackage==null )
- beanPackage = "";
- else
- beanPackage = beanPackage + ".";
-
- proxyBean = beanPackage + resource.getName();
-
- if( proxyBean.toLowerCase().endsWith(".java") || proxyBean.toLowerCase().endsWith(".class"))
- {
- proxyBean = proxyBean.substring(0,proxyBean.lastIndexOf('.'));
- }
- }
- catch( CoreException exc )
- {
- }
-
- return proxyBean;
- }
-
- public IWebServiceClient getWebServiceClient()
- {
- return webServiceClient_;
- }
-
- public boolean getCanRunTestClient(){
- return canRunTestClient_;
- }
-
- public boolean getGenerateProxy()
- {
- return true;
- }
-
- public boolean getCanGenerateProxy()
- {
- return true;
- }
-
- public SelectionList getTestFacility()
- {
- return getLegitTestFacility();
- }
-
- public boolean getIsWebProject()
- {
- return isWebProject;
- }
-
- public void setClientTypeRuntimeServer( TypeRuntimeServer typeRuntimeServer )
- {
- typeRuntimeServer_ = typeRuntimeServer;
- }
-
- public void setModule( String module )
- {
- module_ = module;
- }
-
- public void setModuleType( String moduleType)
- {
- }
-
- public void setResourceContext( ResourceContext resourceContext )
- {
- }
-
- public void setInitialSelection( IStructuredSelection selection )
- {
- selection_ = selection;
- }
- }
-
- private class GenSampleRootCommandFragment extends SequenceFragment
- {
- public GenSampleRootCommandFragment()
- {
- add( new SimpleFragment( new ClientWizardWidgetDefaultingCommand(true), "" ) );
- add( new SimpleFragment( new ClientWizardWidgetOutputCommand(), "" ));
- add( new SimpleFragment( new WSDLSelectionWidgetDefaultingCommand(), ""));
- add( new SimpleFragment( new ClientRuntimeSelectionWidgetDefaultingCommand(), ""));
- add( new SimpleFragment( new ClientExtensionDefaultingCommand( true ), ""));
- add( new SimpleFragment( new InitializeProxyCommand(), "" ));
- add( new SimpleFragment( new ClientExtensionOutputCommand(), "" ) );
- add( new SimpleFragment( new TestDefaultingFragment(),""));
- add( new ClientTestFragment( "ClientTestWidget") );
- add( new FinishFragment() );
- }
-
- /* (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 SelectionCommand
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialSelection", null);
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", InitializeProxyCommand.class );
-
- // Map ClientWizardWidgetDefaultingCommand command.
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "TestService", ClientWizardWidgetOutputCommand.class, "TestService", new ForceTrue() );
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ResourceContext", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "RunTestClient", ClientWizardWidgetOutputCommand.class);
-
- // Map ClientWizardWidgetOutputCommand command.
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "ClientTypeRuntimeServer", ClientRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "TestService", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "RunTestClient", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "ResourceContext", ClientExtensionDefaultingCommand.class);
-
- // Map ClientRuntimeSelectionWidgetDefaultingCommand command
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentType", ClientExtensionDefaultingCommand.class);
-
-
- // Map WSDLSelectionWidgetDefaultingCommand command.
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", WSDLSelectionWidgetDefaultingCommand.class );
- dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "GenWSIL", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "WsilURI", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "WebServiceURI", ClientExtensionDefaultingCommand.class, "WsdlURI", new EclipseIPath2URLStringTransformer());
-
- // Map ClientExtensionDefaultingCommand command.
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionFragment.class);
-
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", WebServiceClientTestArrivalCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", WebServiceClientTestArrivalCommand.class);
-
-
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "GenerateProxy", ClientTestFragment.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestFragment.class );
-
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientNeedEAR", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientEarProjectName", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientEarProjectName", ClientTestDelegateCommand.class,"ClientEarComponentName",null);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ServiceServerInstanceId", FinishDefaultCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServer", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "WsdlURI", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "RunTestClient", ClientTestDelegateCommand.class);
-
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", InitializeProxyCommand.class );
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientJ2EEVersion", InitializeProxyCommand.class);
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProject", InitializeProxyCommand.class, "Module", null );
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProjectType", InitializeProxyCommand.class, "ModuleType", null);
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProjectEAR", InitializeProxyCommand.class, "Ear", null );
- dataRegistry.addMapping( ClientWizardWidgetOutputCommand.class, "ResourceContext", InitializeProxyCommand.class);
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "WsdlURI", InitializeProxyCommand.class );
-
-
-
-
- // Map InitializeProxyCommand command.
- dataRegistry.addMapping(InitializeProxyCommand.class, "WebServiceClient", ClientExtensionOutputCommand.class);
- dataRegistry.addMapping(InitializeProxyCommand.class, "GenerateProxy", ClientExtensionDefaultingCommand.class);
-
- // Map ClientExtensionOutputCommand command.
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", WebServiceClientTestArrivalCommand.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "GenerateProxy", TestDefaultingFragment.class);
- dataRegistry.addMapping(InitializeProxyCommand.class, "CanGenerateProxy", ClientTestFragment.class);
- dataRegistry.addMapping(InitializeProxyCommand.class, "CanRunTestClient", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "GenerateProxy", FinishTestFragment.class, "CanGenerateProxy", null);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "GenerateProxy", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "RunTestClient", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ServerInstanceId", FinishDefaultCommand.class);
-
- // MAP post server config call
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", ClientExtensionOutputCommand.class, "EARProjectName", new StringToIProjectTransformer());
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServerInstance", ClientExtensionOutputCommand.class, "ExistingServerId", null);
-
-
- // Map WebServiceClientTestArrivalCommand command.
- dataRegistry.addMapping(TestDefaultingFragment.class, "TestFacility",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "TestFacility",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Folder",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "JspFolder",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Methods",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProject",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProjectEAR",ClientTestDelegateCommand.class);
-
-
- }
- }
-
- private class ForceTrue implements Transformer
- {
- public Object transform(Object value)
- {
- return new Boolean(true);
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSILWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSILWidgetBinding.java
deleted file mode 100644
index bd7ef39..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSILWidgetBinding.java
+++ /dev/null
@@ -1,88 +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.consumption.ui.widgets.binding;
-
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ImportWSILWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.wsil.AddWSDLToWSILWrapperCommand;
-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.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;
-
-
-public class ImportWSILWidgetBinding implements CommandWidgetBinding
-{
- public ImportWSILWidgetBinding()
- {
- }
- /* (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("ImportWSILWidget"));
- root.add(new SimpleFragment(new AddWSDLToWSILWrapperCommand(), ""));
- 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)
- {
- }
-
- /* (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)
- {
- // ImportWSILWidget
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ImportWSILWidget.class);
-
- // AddWSDLToWSILWrapperCommand
- dataRegistry.addMapping(ImportWSILWidget.class, "GenWSILArguments", AddWSDLToWSILWrapperCommand.class, "Args", 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("ImportWSILWidget",
- ConsumptionUIMessages.TITLE_WSIL_IMPORT,
- ConsumptionUIMessages.DESC_WSIL_IMPORT,
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new ImportWSILWidget();
- }
- }
- );
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSWidgetBinding.java
deleted file mode 100644
index e95cd41..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSWidgetBinding.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.consumption.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 ImportWSWidgetBinding implements CommandWidgetBinding
-{
- private CanFinishRegistry canFinishRegistry;
- private WidgetRegistry widgetRegistry;
- private DataMappingRegistry dataMappingRegistry;
- private PublishToPrivateUDDICommandFragment publishToPrivateUDDICmdFrag;
-
- public ImportWSWidgetBinding()
- {
- 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("WSImport"));
- 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("WSImport",
- ConsumptionUIMessages.PAGE_TITLE_WS_FIND,
- ConsumptionUIMessages.PAGE_DESC_WS_FIND,
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new PublishWSWidget(false);
- }
- }
- );
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionDefaultingCommand.java
deleted file mode 100644
index 4b0bc85..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionDefaultingCommand.java
+++ /dev/null
@@ -1,661 +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
- * -------- -------- -----------------------------------------------------------
- * 20060204 124408 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060524 142635 gilberta@ca.ibm.com - Gilbert Andrews
- * 20060529 141422 kathy@ca.ibm.com - Kathy Chan
- * 20060818 154402 pmoogk@ca.ibm.com - Peter Moogk
- * 20060830 151091 kathy@ca.ibm.com - Kathy Chan, Client side still enabled when there's only stub server
- * 20080205 170141 kathy@ca.ibm.com - Kathy Chan
- * 20080325 184761 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
- * 20090803 283312 ericdp@ca.ibm.com - Eric D. Peters, ANT Client gen- message missing server name subst. variable
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions;
-
-import org.eclipse.core.commands.ExecutionException;
-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.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ValidationUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.RuntimeDescriptor;
-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.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.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-public class ClientExtensionDefaultingCommand extends AbstractDataModelOperation
-{
- // ClientWizardWidget
-
- private boolean developClient_;
- private boolean assembleClient_;
- private boolean deployClient_;
-
- private TypeRuntimeServer clientIds_;
- private String clientRuntimeId_;
- private boolean testService;
- private Boolean installClient;
- private boolean startClient;
- private boolean runTestClient;
- private ResourceContext resourceContext;
-
- // ClientRuntimeSelectionWidget
- //private SelectionListChoices clientChoices_;
- private String clientProjectName_;
- private String clientEarProjectName_;
- //private String clientComponentName_;
- //private String clientEarComponentName_;
- private String clientComponentType_;
- //private String j2eeVersion;
- private boolean clientNeedEAR_;
-
- private String serviceServerFactoryId_;
- private String serviceServerInstanceId_;
-
- // WSDLSelectionWidget
- private boolean genWSIL;
- private String wsilURI;
-
- // WSDLSelectionConditionCommand
- private WebServicesParser webServicesParser;
-
- // WSDLSelectionTreeWidget
- private String wsdlURI;
-
- private boolean isClientScenario_;
- private boolean genProxy_ = true;
- private String launchedServiceTestName;
-
- //ServerDeployableConfigurationCommand
- private String serverInstId_;
-
- public ClientExtensionDefaultingCommand( boolean isClientScenario )
- {
- isClientScenario_ = isClientScenario;
- }
-
- /**
- *
- * @return returns true if this command is running in the client wizard and
- * false if this command is running in the create web service wizard.
- */
- public boolean getIsClientScenario()
- {
- return isClientScenario_;
- }
-
- /*
- public void setRuntime2ClientTypes( SelectionListChoices choices )
- {
- clientChoices_ = choices;
- }
-
-
- public SelectionListChoices getRuntime2ClientTypes()
- {
- return clientChoices_;
- }
- */
-
- public void setClientTypeRuntimeServer(TypeRuntimeServer ids)
- {
- clientIds_ = ids;
- }
-
- public TypeRuntimeServer getClientTypeRuntimeServer()
- {
- if (clientIds_.getServerInstanceId()==null || clientIds_.getServerInstanceId().length()==0)
- {
- //Set the instance id from the service side if the factory ids match
- if (serviceServerInstanceId_!=null && serviceServerInstanceId_.length()>0)
- {
- if (serviceServerFactoryId_!=null && serviceServerFactoryId_.length()>0)
- {
- if (serviceServerFactoryId_.equals(clientIds_.getServerId()))
- {
- clientIds_.setServerInstanceId(serviceServerInstanceId_);
- }
- }
- }
- }
- return clientIds_;
- }
-
- public void setClientRuntimeId(String id)
- {
- clientRuntimeId_ = id;
- }
-
- public String getClientRuntimeId()
- {
- return clientRuntimeId_;
- }
-
- public void setServiceExistingServerInstId(String serverInstId) {
- this.serverInstId_ = serverInstId;
- }
-
- public String getServiceExistingServerInstId(){
- return this.serverInstId_;
- }
-
- /**
- * @return Returns the clientIsExistingServer.
- */
- public boolean isClientIsExistingServer()
- {
- return clientIds_.getServerInstanceId() != null;
- }
-
- /**
- * @return Returns the clientProject.
- */
- public String getClientProject()
- {
- //return clientProjectName_ + "/" + clientComponentName_;
- return clientProjectName_ + "/" + clientProjectName_;
- }
-
- /**
- * @return Returns the clientProjectEAR.
- */
- public String getClientProjectEAR()
- {
- if (clientEarProjectName_!=null && clientEarProjectName_.length()>0)
- {
- //return clientEarProjectName_ + "/" + clientEarComponentName_;
- return clientEarProjectName_ + "/" + clientEarProjectName_;
- }
- else
- {
- return "";
- }
- }
-
- /*
- private String getModuleProjectName( String projectName )
- {
- String result = "";
-
- if( projectName != null && !projectName.equals("") )
- {
- IPath projectPath = new Path( projectName );
- IProject project = (IProject)ResourceUtils.findResource( projectPath );
- String moduleName = J2EEUtils.getFirstWebModuleName( project );
-
- result = projectName + "/" + moduleName;
- }
-
- return result;
- }
- */
- /**
- * @return Returns the clientProjectType.
- */
-
- public String getClientProjectType()
- {
- //return clientChoices_.getChoice().getList().getSelection();
- return clientComponentType_;
- }
-
- /**
- * @return Returns the clientRuntime.
- */
- public String getClientRuntime()
- {
- return clientIds_.getRuntimeId();
- }
-
- /**
- * @return Returns the clientServer.
- */
- public String getClientServer()
- {
- return clientIds_.getServerId();
- }
-
- public String getClientServerInstance()
- {
- return clientIds_.getServerInstanceId();
- }
-
- public void setClientExistingServerInstanceId(String serverInstId){
-
- if (clientIds_.getServerInstanceId()==null)
- clientIds_.setServerInstanceId(serverInstId);
- }
-
- /**
- * @return Returns the genWSIL.
- */
- public boolean isGenWSIL()
- {
- return genWSIL;
- }
-
- /**
- * @param genWSIL
- * The genWSIL to set.
- */
- public void setGenWSIL(boolean genWSIL)
- {
- this.genWSIL = genWSIL;
- }
-
- /**
- * @return Returns the resourceContext.
- */
- public ResourceContext getResourceContext()
- {
- return resourceContext;
- }
-
- /**
- * @param resourceContext
- * The resourceContext to set.
- */
- public void setResourceContext(ResourceContext resourceContext)
- {
- this.resourceContext = resourceContext;
- }
-
- /**
- * @return Returns the testProxySelected.
- */
- public boolean getTestService()
- {
- return testService;
- }
-
- /**
- * @param testProxySelected
- * The testProxySelected to set.
- */
- public void setTestService(boolean testService)
- {
- this.testService = testService;
- }
-
- /**
- * @return Returns the testProxySelected.
- */
- public boolean getRunTestClient()
- {
- return runTestClient;
- }
-
- /**
- * @param testProxySelected
- * The testProxySelected to set.
- */
- public void setRunTestClient(boolean runTestClient)
- {
- this.runTestClient = runTestClient;
- }
-
- public boolean getDevelopClient() {
- return developClient_;
- }
-
- public void setDevelopClient(boolean developClient) {
- this.developClient_ = developClient;
- }
-
- public boolean getAssembleClient() {
- return assembleClient_;
- }
-
- public void setAssembleClient(boolean assembleClient) {
- this.assembleClient_ = assembleClient;
- }
-
- public boolean getDeployClient() {
- return deployClient_;
- }
-
- public void setDeployClient(boolean deployClient) {
- this.deployClient_ = deployClient;
- }
-
- /**
- * @return Returns the installClient.
- */
- public Boolean getInstallClient()
- {
- return installClient;
- }
-
- /**
- * @param installClient
- * The installClient to set.
- */
- public void setInstallClient(Boolean installClient)
- {
- this.installClient = installClient;
- }
-
- /**
- * @return Returns the startClient.
- */
- public boolean getStartClient()
- {
- return startClient;
- }
-
- /**
- * @param startClient
- * The startClient to set.
- */
- public void setStartClient(boolean startClient)
- {
- this.startClient = startClient;
- }
-
- /**
- * @return Returns the wsdlURI.
- */
- public String getWsdlURI()
- {
- return wsdlURI;
- }
-
- /**
- * @param wsdlURI
- * The wsdlURI to set.
- */
- public void setWsdlURI(String wsdlURI)
- {
- this.wsdlURI = wsdlURI;
- }
-
- /**
- * @return Returns the wsilURI.
- */
- public String getWsilURI()
- {
- return wsilURI;
- }
-
- /**
- * @param wsilURI
- * The wsilURI to set.
- */
- public void setWsilURI(String wsilURI)
- {
- this.wsilURI = wsilURI;
- }
-
- /**
- * @return Returns the webServicesParser.
- */
- public WebServicesParser getWebServicesParser()
- {
- if (webServicesParser != null)
- return webServicesParser;
- else
- return new WebServicesParserExt();
- }
-
- /**
- * @param webServicesParser
- * The webServicesParser to set.
- */
- public void setWebServicesParser(WebServicesParser webServicesParser)
- {
- this.webServicesParser = webServicesParser;
- }
-
- /**
- * @return Returns the j2eeVersion.
- */
- public String getClientJ2EEVersion()
- {
- return "14"; //rm j2ee
- }
-
- /**
- * @param version The j2eeVersion to set.
- */
- /*
- public void setClientJ2EEVersion(String version)
- {
- j2eeVersion = version;
- }
- */
- /**
- *
- * @return returns true if a proxy should be generated and false otherwise.
- */
- public boolean getGenerateProxy()
- {
- return genProxy_;
- }
-
- public void setGenerateProxy( boolean genProxy )
- {
- genProxy_ = genProxy;
- }
-
- public void setLaunchedServiceTestName(String launchedServiceTestName)
- {
- this.launchedServiceTestName = launchedServiceTestName;
- }
-
- /**
- *
- * @return returns the name of the test facility to launch.
- */
- public String getLaunchedServiceTestName()
- {
- return launchedServiceTestName;
- }
-
- /**
- *
- * @return returns true if the client project needs an EAR project.
- */
- public boolean getClientNeedEAR()
- {
- return clientNeedEAR_;
- }
-
- public void setClientNeedEAR(boolean clientNeedEAR)
- {
- clientNeedEAR_ = clientNeedEAR;
- }
-
-
- public void setClientComponentType(String clientComponentType)
- {
- this.clientComponentType_ = clientComponentType;
- }
-
- public void setClientProjectName(String clientProjectName)
- {
- this.clientProjectName_ = clientProjectName;
- }
-
- /*
- public void setClientComponentName(String clientComponentName)
- {
- this.clientComponentName_ = clientComponentName;
- }
- */
-
- public void setClientEarProjectName(String clientEarProjectName)
- {
- this.clientEarProjectName_ = clientEarProjectName;
- }
-
- /*
- public void setClientEarComponentName(String clientEarComponentName)
- {
- this.clientEarComponentName_ = clientEarComponentName;
- }
- */
-
- public String getClientEarProjectName()
- {
- return clientEarProjectName_;
- }
-
- /*
- public String getClientEarComponentName()
- {
- return clientEarComponentName_;
- }
- */
-
- public void setServiceServerFactoryId(String id)
- {
- serviceServerFactoryId_ = id;
- }
-
- public void setServiceServerInstanceId(String id)
- {
- serviceServerInstanceId_ = id;
- }
-
- public boolean getCanRunTestClient(){
- if(clientIds_.getServerInstanceId() != null) return true;
-
- return false;
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
- {
- IEnvironment env = getEnvironment();
- //Do some basic validation to ensure the server/runtime/type combination is supported.
- //This is needed to catch problems in the defaulting
- //when the user clicks Finish prior to page 3 of the wizard.
-
- IStatus status = Status.OK_STATUS;
-
- String scenario = ConsumptionUIMessages.MSG_CLIENT_SUB;
-
- //Ensure server and runtime are non-null
- String runtimeId = clientIds_.getRuntimeId();
- String serverId = clientIds_.getServerId();
- String typeId = clientIds_.getTypeId();
-
- if( runtimeId == null || runtimeId.length()==0)
- {
- status = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_NO_RUNTIME, new String[]{ scenario } ) );
- env.getStatusHandler().reportError(status);
- }
-
- if( serverId == null || serverId.length()==0)
- {
- //Popup and error if the selected client project does not exist.
- IProject clientProject = ProjectUtilities.getProject(clientProjectName_);
- if (!clientProject.exists())
- {
- String runtimeLabel = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(runtimeId);
- status = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_PROJECT_MUST_EXIST, new String[]{clientProjectName_, runtimeLabel } ) );
- env.getStatusHandler().reportError(status);
- }
- else
- {
- RuntimeDescriptor desc = WebServiceRuntimeExtensionUtils2.getRuntimeById(runtimeId);
-
- if (desc.getServerRequired())
- {
- status = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_NO_SERVER, new String[] { scenario }));
- env.getStatusHandler().reportError(status);
- }
- else
- {
- // No server has been selected and the selected Web service runtime
- // does not
- // require a server. Set deploy, install, run, and test to false.
- deployClient_ = false;
- installClient = Boolean.FALSE;
- startClient = false;
- //testService = Boolean.FALSE;
- }
- }
- }
-
- // If the server is non-null, ensure there is an installed server with ID the same as 'serverID' registered in Eclipse
- boolean noRuntimeInstalled = true;
- if (serverId != null) {
- // If the server is non-null, ensure there is an installed server with ID the same as 'serverID' registered in Eclipse
- String[] runtimes = WebServiceRuntimeExtensionUtils2.getAllServerFactoryIdsWithRuntimes();
- for (int i = 0; i < runtimes.length; i++) {
- if (runtimes[i].equals(serverId)){
- noRuntimeInstalled = false;
- break;
- }
- }
- if (noRuntimeInstalled){
- String serverLabel = WebServiceRuntimeExtensionUtils2.getServerLabelById(serverId);
- if (serverLabel == null) // Cannot translate from id to label, so let's just use the id
- serverLabel = serverId;
- status = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_ERROR_NO_SERVER_RUNTIME_INSTALLED, new String[] {serverLabel}));
- env.getStatusHandler().reportError(status);
- }
- }
-
- //If the server is non-null and is installed in Eclipse, ensure the server, runtime, and type are compatible
- if (!noRuntimeInstalled && serverId != null && serverId.length() > 0)
- {
- if (!WebServiceRuntimeExtensionUtils2.isServerClientRuntimeTypeSupported(serverId, runtimeId, typeId))
- {
- String serverLabel = WebServiceRuntimeExtensionUtils2.getServerLabelById(serverId);
- String runtimeLabel = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(runtimeId);
- status = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_INVALID_SRT_SELECTIONS, new String[] { serverLabel,
- runtimeLabel }));
- env.getStatusHandler().reportError(status);
- }
- //If the project exists, ensure it supports the Web service type, Web service runtime, and server.
- if (clientProjectName_ != null && ProjectUtilities.getProject(clientProjectName_).exists()) {
- ValidationUtils vUtil = new ValidationUtils();
- if (!vUtil.doesServerSupportProject(serverId,clientProjectName_)) {
- status = StatusUtils.errorStatus(NLS.bind(
- ConsumptionUIMessages.MSG_CLIENT_SERVER_DOES_NOT_SUPPORT_PROJECT,
- new String[] { WebServiceRuntimeExtensionUtils2.getServerLabelById(serverId),clientProjectName_ }));
- env.getStatusHandler().reportError(status);
- }
- }
- // Determine if the selected server type has only stub runtimes associated
- // with it and if a server instance is not selected.
- // If so, set install and test to false in the context.
- IRuntime nonStubRuntime = ServerUtils.getNonStubRuntime(serverId);
- if (nonStubRuntime == null && clientIds_.getServerInstanceId() == null)
- {
- installClient = Boolean.FALSE;
- startClient = false;
- //testService = Boolean.FALSE;
- }
- }
-
- // calculate the most appropriate clientRuntimeId based on current settings.
- clientRuntimeId_ = WebServiceRuntimeExtensionUtils2.getClientRuntimeId(clientIds_, clientProjectName_, clientComponentType_);
-
- return status;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionFragment.java
deleted file mode 100644
index fa05d05..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionFragment.java
+++ /dev/null
@@ -1,40 +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.consumption.ui.widgets.extensions;
-
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.env.core.fragment.ExtensionFragment;
-
-
-public class ClientExtensionFragment extends ExtensionFragment
-{
- public ClientExtensionFragment()
- {
- }
-
- protected ClientExtensionFragment( ClientExtensionFragment fragment )
- {
- super( fragment );
- }
-
- public void setClientTypeRuntimeServer( TypeRuntimeServer ids )
- {
- setExtensionIds( new String[]{ ids.getTypeId(), ids.getRuntimeId(), ids.getServerId() } );
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#clone()
- */
- public Object clone()
- {
- return new ClientExtensionFragment( this );
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionOutputCommand.java
deleted file mode 100644
index 50631d4..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionOutputCommand.java
+++ /dev/null
@@ -1,79 +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
- * -------- -------- -----------------------------------------------------------
- * 20060728 145426 kathy@ca.ibm.com - Kathy Chan
- * 20070502 180304 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-/**
- */
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient;
-
-public class ClientExtensionOutputCommand extends AbstractDataModelOperation
-{
- private IWebServiceClient webServiceClient_;
-
- /**
- * @return Returns the proxyBean.
- */
-
- public String getProxyBean()
- {
- return webServiceClient_.getWebServiceClientInfo().getImplURL();
- }
-
- public boolean getCanGenerateProxy()
- {
- return !(webServiceClient_.getWebServiceClientInfo().getImplURL() == null);
- }
-
- /**
- * @return Returns the setEndpointMethod.
- */
- public String getSetEndpointMethod()
- {
- return "setEndpoint";
- }
-
- public void setWebServiceClient(IWebServiceClient wsc)
- {
- webServiceClient_ = wsc;
- }
-
- public String getServerInstanceId()
- {
- return webServiceClient_.getWebServiceClientInfo().getServerInstanceId();
- }
-
- public String getServerFactoryId()
- {
- return webServiceClient_.getWebServiceClientInfo().getServerFactoryId();
- }
-
- /**
- * @return Returns the proxyEndpoint.
- */
- public String getProxyEndpoint() {
- return webServiceClient_.getWebServiceClientInfo().getProxyEndpoint();
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
- {
- return Status.OK_STATUS;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionDefaultingCommand.java
deleted file mode 100644
index 53bbfd6..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionDefaultingCommand.java
+++ /dev/null
@@ -1,464 +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
- * -------- -------- -----------------------------------------------------------
- * 20060204 124408 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060529 141422 kathy@ca.ibm.com - Kathy Chan
- * 20060823 154938 pmoogk@ca.ibm.com - Peter Moogk
- * 20080205 170141 kathy@ca.ibm.com - Kathy Chan
- * 20080326 171705 trungha@ca.ibm.com - Trung, improve AntTask errors report
- * 20080409 219121 trungha@ca.ibm.com - Trung Ha
- * 20080729 241275 ericdp@ca.ibm.com - Eric D. Peters, No Validation error generating Web Service client if dialog hidden
- * 20081028 248625 ericdp@ca.ibm.com - Eric D. Peters, Exceptions running ANT tasks using inappropriate projects
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions;
-
-import org.eclipse.core.commands.ExecutionException;
-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.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.common.FacetUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ValidationUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.RuntimeDescriptor;
-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.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.IRuntime;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-
-public class ServerExtensionDefaultingCommand extends AbstractDataModelOperation
-{
- private boolean developService_;
- private boolean assembleService_;
- private boolean deployService_;
-
- private Boolean installService;
- private IProject initialProject_;
- private Boolean startService;
- private Boolean testService;
- private Boolean publishService;
- private TypeRuntimeServer serviceIds_;
- private String serviceRuntimeId_;
- //private SelectionListChoices serviceChoices_;
- private String serviceProjectName_;
- private String serviceEarProjectName_;
- private String serviceComponentType_;
- //private String serviceComponentName_;
- //private String serviceEarComponentName_;
- //private String j2eeVersion;
- private boolean serviceNeedEAR_;
- private WebServicesParser wsdlParser_;
-
-
-
- public void setServiceTypeRuntimeServer(TypeRuntimeServer ids)
- {
- serviceIds_ = ids;
- }
-
- public void setServiceExistingServerInstanceId(String serverInstId){
-
- if (serviceIds_.getServerInstanceId()==null)
- serviceIds_.setServerInstanceId(serverInstId);
- }
-
- /**
- *
- * @return returns the TypeRuntimeService object that the user has selected on
- * page 3 of the wizard.
- */
- public TypeRuntimeServer getServiceTypeRuntimeServer()
- {
- return serviceIds_;
- }
-
- public void setServiceRuntimeId(String id)
- {
- serviceRuntimeId_ = id;
- }
-
- public String getServiceRuntimeId()
- {
- return serviceRuntimeId_;
- }
-
- /*
- public void setServiceProject2EARProject(SelectionListChoices choices)
- {
- serviceChoices_ = choices;
- }
- */
-
- /**
- * @return Returns the publishService.
- */
- public Boolean getPublishService()
- {
- return publishService;
- }
-
- /**
- * @param publishService
- * The publishService to set.
- */
- public void setPublishService(Boolean publishService)
- {
- this.publishService = publishService;
- }
-
- /**
- * @return Returns the serverIsExistingServer.
- */
- public boolean getServerIsExistingServer()
- {
- return serviceIds_.getServerInstanceId() != null;
- }
-
- /**
-
- * @return Returns the serverInstanceId
- */
- public String getServiceServerInstanceId()
- {
- return serviceIds_.getServerInstanceId();
- }
-
- /**
- * @return Returns the serverProject.
- */
- public String getServerProject()
- {
- return serviceProjectName_ + "/" + serviceProjectName_;
- }
-
- /**
- * @return Returns the serverProjectEAR.
- */
- public String getServerProjectEAR()
- {
- if (serviceEarProjectName_!=null && serviceEarProjectName_.length()>0)
- {
- return serviceEarProjectName_ + "/" + serviceEarProjectName_;
- }
- else
- {
- return "";
- }
- }
-
- /**
- * @return Returns the serverRuntime.
- */
- public String getServerRuntime()
- {
- return serviceIds_.getRuntimeId();
- }
-
- /**
- * @return Returns the serverServer.
- */
- public String getServerServer()
- {
- return serviceIds_.getServerId();
- }
-
- /**
- * @return Returns the serviceScenarioId.
- */
- public String getServiceScenarioId()
- {
- return serviceIds_.getTypeId();
- }
-
- 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;
- }
-
- /**
- * @return Returns the installService.
- */
- public Boolean getInstallService()
- {
- return installService;
- }
- /**
- * @param installService
- * Specifies if service should be installed.
- */
- public void setInstallService(Boolean installService)
- {
- this.installService = installService;
- }
-
- /**
- * @return Returns the startService.
- */
- public Boolean getStartService()
- {
- return startService;
- }
- public void setInitialProject(IProject initialProject)
- {
- initialProject_ = initialProject;
- }
-
- public IProject getInitialProject()
- {
- return initialProject_;
- }
- /**
- * @param startService
- * The startService to set.
- */
- public void setStartService(Boolean startService)
- {
- this.startService = startService;
- }
-
- /**
- * @return Returns the testService.
- */
- public Boolean getTestService()
- {
- return testService;
- }
-
- /**
- * @param testService
- * The testService to set.
- */
- public void setTestService(Boolean testService)
- {
- this.testService = testService;
- }
-
- public Boolean getPublish()
- {
- return new Boolean(true);
- }
-
- /**
- * @return Returns the j2eeVersion.
- */
- public String getServiceJ2EEVersion()
- {
- return "14"; //rm j2ee
- }
-
- /**
- *
- * @return returns true if the web service project needs to be in an EAR project.
- */
- public boolean getServiceNeedEAR()
- {
- return serviceNeedEAR_;
- }
-
- public void setServiceNeedEAR(boolean serviceNeedEAR)
- {
- serviceNeedEAR_ = serviceNeedEAR;
- }
-
- /**
- * @return Returns the wsdlParser_.
- */
- public WebServicesParser getWebServicesParser()
- {
- if( wsdlParser_ == null )
- {
- wsdlParser_ = new WebServicesParserExt();
- }
-
- return wsdlParser_;
- }
- /**
- * @param wsdlParser_ The wsdlParser_ to set.
- */
- public void setWebServicesParser(WebServicesParser wsdlParser )
- {
- wsdlParser_ = wsdlParser;
- }
-
-
- public void setServiceProjectName(String serviceProjectName)
- {
- this.serviceProjectName_ = serviceProjectName;
- }
-
- public void setServiceEarProjectName(String serviceEarProjectName)
- {
- this.serviceEarProjectName_ = serviceEarProjectName;
- }
-
- public void setServiceComponentType(String type)
- {
- this.serviceComponentType_ = type;
- }
-
- public String getServiceComponentType()
- {
- return serviceComponentType_;
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
- {
- IEnvironment env = getEnvironment();
- //Do some basic validation to ensure the server/runtime/type combination is supported.
- //This is needed to catch problems in the defaulting
- //when the user clicks Finish prior to page 3 of the wizard.
-
- IStatus status = Status.OK_STATUS;
-
- String scenario = ConsumptionUIMessages.MSG_SERVICE_SUB;
-
- //Ensure server and runtime are non-null
- String runtimeId = serviceIds_.getRuntimeId();
- String serverId = serviceIds_.getServerId();
- String typeId = serviceIds_.getTypeId();
-
- if( runtimeId == null || runtimeId.length()==0)
- {
- status = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_NO_RUNTIME, new String[]{ scenario } ) );
- env.getStatusHandler().reportError(status);
- }
-
- if( serverId == null || serverId.length()==0)
- {
- //Popup and error if the selected service project does not exist.
- IProject serviceProject = ProjectUtilities.getProject(serviceProjectName_);
- if (!serviceProject.exists())
- {
- String runtimeLabel = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(runtimeId);
- status = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_PROJECT_MUST_EXIST, new String[]{ serviceProjectName_, runtimeLabel } ) );
- env.getStatusHandler().reportError(status);
- }
- else
- {
-
- RuntimeDescriptor desc = WebServiceRuntimeExtensionUtils2.getRuntimeById(runtimeId);
- if (desc.getServerRequired())
- {
- status = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_NO_SERVER, new String[] { scenario }));
- env.getStatusHandler().reportError(status);
- }
- else
- {
- // No server has been selected and the selected Web service runtime
- // does not require a server. Set deploy, install, run, and test to false.
- deployService_ = false;
- installService = Boolean.FALSE;
- startService = Boolean.FALSE;
- testService = Boolean.FALSE;
- }
- }
- }
-
- // If the server is non-null, ensure there is an installed server with ID the same as 'serverID' registered in Eclipse
- boolean noRuntimeInstalled = true;
- if (serverId != null) {
- String[] runtimes = WebServiceRuntimeExtensionUtils2.getAllServerFactoryIdsWithRuntimes();
-
- for (int i = 0; i < runtimes.length; i++) {
- if (runtimes[i].equals(serverId)){
- noRuntimeInstalled = false;
- break;
- }
- }
- if (noRuntimeInstalled){
- String serverLabel = WebServiceRuntimeExtensionUtils2.getServerLabelById(serverId);
- if (serverLabel == null) // Cannot translate from id to label, so let's just use the id
- serverLabel = serverId;
- status = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_ERROR_NO_SERVER_RUNTIME_INSTALLED, new String[] {serverLabel}));
- env.getStatusHandler().reportError(status);
- }
- }
-
- //If the server is non-null and is installed in Eclipse, ensure the server, runtime, and type are compatible
- if (!noRuntimeInstalled && serverId != null && serverId.length() > 0)
- {
- if (!WebServiceRuntimeExtensionUtils2.isServerRuntimeTypeSupported(serverId, runtimeId, typeId))
- {
- String serverLabel = WebServiceRuntimeExtensionUtils2.getServerLabelById(serverId);
- String runtimeLabel = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(runtimeId);
- status = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_INVALID_SRT_SELECTIONS, new String[] { serverLabel,
- runtimeLabel }));
- env.getStatusHandler().reportError(status);
- }
- //If the project exists, ensure it supports the Web service type, Web service runtime, and server.
- if (getInitialProject() != null && getInitialProject().getName() != null && ProjectUtilities.getProject(getInitialProject().getName()).exists()) {
- ValidationUtils valUtils = new ValidationUtils();
-
- if (WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(typeId) == WebServiceScenario.BOTTOMUP &&
- FacetUtils.isJavaProject(getInitialProject())){
- if(!valUtils.doesServerSupportProject(serverId,getInitialProject().getName())){
- status = StatusUtils.errorStatus(NLS.bind(
- ConsumptionUIMessages.MSG_SERVICE_SERVER_DOES_NOT_SUPPORT_JAVAPROJECT,
- new String[] { WebServiceRuntimeExtensionUtils2.getServerLabelById(serverId), getInitialProject().getName() }));
- env.getStatusHandler().reportError(status);
- }
- }
- if (!valUtils.doesServerSupportProject(serverId, serviceProjectName_)) {
- status = StatusUtils.errorStatus(NLS.bind(
- ConsumptionUIMessages.MSG_SERVICE_SERVER_DOES_NOT_SUPPORT_PROJECT,
- new String[] { WebServiceRuntimeExtensionUtils2.getServerLabelById(serverId),
- serviceProjectName_ }));
- env.getStatusHandler().reportError(status);
- }
- }
- // Determine if the selected server type has only stub runtimes associated
- // with it and if a server instance is not selected.
- // If so, set install, run, and test to false in the context.
- IRuntime nonStubRuntime = ServerUtils.getNonStubRuntime(serverId);
- if (nonStubRuntime == null && serviceIds_.getServerInstanceId() == null)
- {
- installService = Boolean.FALSE;
- startService = Boolean.FALSE;
- testService = Boolean.FALSE;
- }
- }
-
- // calculate the most appropriate clientRuntimeId based on current settings.
- serviceRuntimeId_ = WebServiceRuntimeExtensionUtils2.getServiceRuntimeId( serviceIds_, serviceProjectName_, serviceComponentType_);
-
- return status;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionFragment.java
deleted file mode 100644
index 500a495..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionFragment.java
+++ /dev/null
@@ -1,41 +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.consumption.ui.widgets.extensions;
-
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.env.core.fragment.ExtensionFragment;
-
-
-public class ServerExtensionFragment extends ExtensionFragment
-{
- public ServerExtensionFragment()
- {
-
- }
-
- protected ServerExtensionFragment( ServerExtensionFragment fragment )
- {
- super( fragment );
- }
-
- public void setServiceTypeRuntimeServer( TypeRuntimeServer ids )
- {
- setExtensionIds( new String[]{ ids.getTypeId(), ids.getRuntimeId(), ids.getServerId() } );
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#clone()
- */
- public Object clone()
- {
- return new ServerExtensionFragment( this );
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionOutputCommand.java
deleted file mode 100644
index b183cd2..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionOutputCommand.java
+++ /dev/null
@@ -1,115 +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.consumption.ui.widgets.extensions;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-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.WebServicesParser;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-
-public class ServerExtensionOutputCommand extends AbstractDataModelOperation
-{
- //private String wsdlURI_;
- private WebServicesParser wsdlParser_;
- private IWebService webService_;
-
- private boolean isWebProjectStartupRequested_ = false;
-
-
- /**
- * @return Returns the wsdlURI.
- */
- public String getWsdlURI()
- {
- return webService_.getWebServiceInfo().getWsdlURL();
- }
-
- /**
- * @param wsdlURI
- * The wsdlURI to set.
- */
- /*
- public void setWsdlURI(String wsdlURI)
- {
- wsdlURI_ = wsdlURI;
- }
- */
-
- public void setWebService(IWebService ws)
- {
- webService_ = ws;
- }
-
- /**
- * @return Returns the wsdlParser_.
- */
- public WebServicesParser getWebServicesParser()
- {
- if( wsdlParser_ == null )
- {
- wsdlParser_ = new WebServicesParserExt();
- }
-
- return wsdlParser_;
- }
- /**
- * @param wsdlParser_ The wsdlParser_ to set.
- */
- public void setWebServicesParser(WebServicesParser wsdlParser_)
- {
- this.wsdlParser_ = wsdlParser_;
- }
-/**
- * @param earProjectName The earProjectName to set.
- */
-public void setEarProjectName(String earProjectName) {
-}
-/**
- * @param existingServerId The existingServerId to set.
- */
-public void setExistingServerId(String existingServerId) {
-}
-
-/**
- * @return Returns the isRestartProjectNeeded.
- */
-public boolean getIsWebProjectStartupRequested() {
- return isWebProjectStartupRequested_;
-}
-/**
- * @param isRestartProjectNeeded The isRestartProjectNeeded to set.
- */
-public void setIsWebProjectStartupRequested(boolean isRestartProjectNeeded) {
- this.isWebProjectStartupRequested_ = isRestartProjectNeeded;
-}
-
-public String getServiceServerFactoryId()
-{
- return webService_.getWebServiceInfo().getServerFactoryId();
-}
-
-public String getServiceServerInstanceId()
-{
- return webService_.getWebServiceInfo().getServerInstanceId();
-}
-
-public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
-{
- return Status.OK_STATUS;
-}
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/AbstractObjectSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/AbstractObjectSelectionWidget.java
deleted file mode 100644
index 805c970..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/AbstractObjectSelectionWidget.java
+++ /dev/null
@@ -1,67 +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
- * -------- -------- -----------------------------------------------------------
- * 20060410 135441 joan@ca.ibm.com - Joan Haggarty
- * 20060420 135912 joan@ca.ibm.com - Joan Haggarty
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-
-
-public abstract class AbstractObjectSelectionWidget extends SimpleWidgetDataContributor implements IObjectSelectionWidget
-{
- public void setInitialSelection(IStructuredSelection initialSelection)
- {
- // subclass should override this method
- }
-
- public IStructuredSelection getObjectSelection()
- {
- // subclass should override this method
- return new StructuredSelection();
- }
-
- public IStatus validateSelection(IStructuredSelection objectSelection)
- {
- // subclass should override this method
- return Status.OK_STATUS;
- }
-
- public IProject getProject()
- {
- // subclass should override this method
- return null;
- }
-
- public String getObjectSelectionDisplayableString()
- {
- // subclass should override this method
- return "";
- }
-
- public Point getWidgetSize()
- {
- // subclasses should override with an appropriate default dialog size for this widget
- return null;
- }
-
- public boolean validate(String s) {
- // subclass should override this method
- return true;
- }
- }
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionTransformer.java
deleted file mode 100644
index ebd83f1..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionTransformer.java
+++ /dev/null
@@ -1,71 +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
- * -------- -------- -----------------------------------------------------------
- * 20070116 159618 makandre@ca.ibm.com - Andrew Mak, Project and EAR not defaulted properly when wizard launched from JSR-109 Web services branch in J2EE Project Explorer
- * 20080212 208795 ericdp@ca.ibm.com - Eric D. Peters, WS wizard framework should support EJB 3.0
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.webservice.wsdd.EJBLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-
-public class EJBSelectionTransformer implements Transformer
-{
-
- public Object transform(Object value)
- {
- if (value instanceof IStructuredSelection)
- {
- Object sel = ((IStructuredSelection)value).getFirstElement();
- if (sel instanceof EnterpriseBean)
- {
- return new StructuredSelection(((EnterpriseBean)sel).getName());
- }
- else if (sel instanceof SessionBean)
- {
- return new StructuredSelection(((SessionBean)sel).getEjbName());
- }
- else if (sel instanceof ServiceImplBean)
- {
- return new StructuredSelection(getBeanName((ServiceImplBean) sel));
- }
- else if (sel instanceof EJBLink)
- {
- return new StructuredSelection(getBeanName((EJBLink) sel));
- }
- }
- return value;
- }
-
- private String getBeanName(ServiceImplBean bean) {
- EObject eObject = bean.eContainer();
- if (eObject instanceof PortComponent) {
- PortComponent pc = (PortComponent) eObject;
- return pc.getPortComponentName();
- }
- return "";
- }
-
- private String getBeanName(EJBLink link) {
- EObject eObject = link.eContainer();
- if (eObject instanceof ServiceImplBean)
- return getBeanName((ServiceImplBean) eObject);
- return "";
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionWidget.java
deleted file mode 100644
index ee4c831..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionWidget.java
+++ /dev/null
@@ -1,392 +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
- * -------- -------- -----------------------------------------------------------
- * 20060329 128069 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060418 136180 kathy@ca.ibm.com - Kathy Chan
- * 20060524 141194 joan@ca.ibm.com - Joan Haggarty
- * 20060825 135570 makandre@ca.ibm.com - Andrew Mak, Service implementation URL not displayed properly on first page
- * 20080212 208795 ericdp@ca.ibm.com - Eric Peters, WS wizard framework should support EJB 3.0
- * 20080229 218696 ericdp@ca.ibm.com - Eric D. Peters, APIs using EJBArtifactEdit not able to deal with some EJB 3.0 beans properly
- * 20080428 224726 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
-
-import java.util.Collections;
-import java.util.Hashtable;
-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.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EJBResource;
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.javaee.ejb.EnterpriseBeans;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-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.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class EJBSelectionWidget extends AbstractObjectSelectionWidget implements IObjectSelectionWidget
-{
-
- private Combo earList;
- private EJBTableViewer beanList;
- private IVirtualComponent[] earComponents;
- private Integer selectedBeanIndex = null;
- private Vector ejbBeanNames;
- private Vector ejbComponentNames;
- private Vector ejbComponentProjectNames;
- private Hashtable ejbValuesByEARSelectionCache;
- private Listener statusListener_;
- private String displayString_ = "";
- /* CONTEXT_ID PEBD0001 for the EAR Projects drop-down box */
- private String INFOPOP_PEBD_EAR_PROJECTS = "PEBD0001";
- /* CONTEXT_ID PEBD0002 for the table containing all of the bean names */
- private String INFOPOP_PEBD_TABLE_BEAN_NAMES = "PEBD0002";
-
- public EJBSelectionWidget()
- {
- earComponents = J2EEUtils.getAllEARComponents();
- ejbValuesByEARSelectionCache = new Hashtable();
- }
-
- public String getSelectedBean()
- {
- if (selectedBeanIndex != null)
- {
- return (String) (ejbBeanNames.elementAt(selectedBeanIndex.intValue()));
- }
- return null;
- }
-
- public String getSelectedProject()
- {
- if (selectedBeanIndex != null)
- {
- return (String) (ejbComponentProjectNames.elementAt(selectedBeanIndex.intValue()));
- }
- return null;
- }
-
- public WidgetDataEvents addControls(Composite parent, Listener statusListener)
- {
- statusListener_ = statusListener;
- UIUtils utils = new UIUtils( WebServiceConsumptionUIPlugin.ID );
-
- Composite composite = utils.createComposite(parent, 1, 0, 0);
-
- Composite projectComposite = utils.createComposite(composite, 2);
- new Label(projectComposite, SWT.NULL).setText(ConsumptionUIMessages.LABEL_EAR_PROJECTS);
- earList = new Combo(projectComposite, SWT.DROP_DOWN | SWT.READ_ONLY);
- earList.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- earList.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent evt)
- {
- Combo widget = (Combo) (evt.widget);
- int earListSelectionIndex = widget.getSelectionIndex();
- if (earListSelectionIndex > 0)
- {
- setBeanList(earComponents[earListSelectionIndex-1]);
- }
- else
- {
- setBeanList(null);
- }
- selectedBeanIndex = null;
- statusListener_.handleEvent(null);
- }
- });
- addEARNamesToList();
- earList.setToolTipText(ConsumptionUIMessages.TOOLTIP_EAR_PROJECTS);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(earList, INFOPOP_PEBD_EAR_PROJECTS);
-
- Group beanComposite = utils.createGroup(composite, ConsumptionUIMessages.LABEL_EJB_BEAN_NAME, "", "");
- beanList = new EJBTableViewer(beanComposite);
- Table beanTable = beanList.getTable();
- GridData gd = new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL);
- gd.heightHint = 100;
- beanTable.setLayoutData(gd);
- beanTable.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent evt)
- {
- Table table = (Table) (evt.widget);
- selectedBeanIndex = new Integer(table.getSelectionIndex());
- statusListener_.handleEvent(null);
- }
- });
- beanTable.setToolTipText(ConsumptionUIMessages.TOOLTIP_TABLE_BEAN_NAMES);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(beanTable, INFOPOP_PEBD_TABLE_BEAN_NAMES);
-
- if (earComponents != null && earComponents.length > 0)
- {
- setBeanList(earComponents[0]);
- }
- else
- {
- setBeanList(null);
- }
-
- // This is a dummy label that forces the status label into the second
- // column.
- new Label(composite, SWT.NULL).setText("");
-
- return this;
- }
-
-
-
- private void addEARNamesToList()
- {
- earList.add(ConsumptionUIMessages.LABEL_SHOW_ALL_STATELESS_SESSION_EJBS);
- if (earComponents != null && earComponents.length > 0)
- {
- for (int index = 0; index < earComponents.length; index++)
- {
- earList.add(earComponents[index].getName());
- }
- earList.setText(earList.getItem(1));
- }
- }
-
- private void setBeanList(IVirtualComponent earComponent)
- {
- String cacheKey = (earComponent == null)? earList.getItem(0): earComponent.getName();
-
- //Check if we've already cached results for this case. If so, use the
- //cached values and return. If not, continue.
- EJBTableValues cachedValues = (EJBTableValues)ejbValuesByEARSelectionCache.get(cacheKey);
- if (cachedValues != null)
- {
- ejbBeanNames = cachedValues.cachedEjbBeanNames;
- ejbComponentNames = cachedValues.cachedEjbComponentNames;
- ejbComponentProjectNames = cachedValues.cachdedEjbComponentProjectNames;
- beanList.setData(ejbBeanNames, ejbComponentNames);
- beanList.setInput(ejbBeanNames);
- return;
- }
-
- IVirtualComponent[] ejbComponentsArray = null;
- if (earComponent == null)
- {
- ejbComponentsArray = J2EEUtils.getAllEJBComponents();
- }
- else
- {
- ejbComponentsArray = J2EEUtils.getReferencingEJBComponentsFromEAR(earComponent.getProject());
- }
-
- Table beanTable = beanList.getTable();
- beanTable.removeAll();
- ejbBeanNames = new Vector();
- ejbComponentNames = new Vector();
- ejbComponentProjectNames = new Vector();
- for (int index = 0; index < ejbComponentsArray.length; index++)
- {
- IProject project = ejbComponentsArray[index].getProject();
- Vector beans = J2EEUtils.getBeanNames(project);
- String componentName = ejbComponentsArray[index].getName();
- String projectName = ejbComponentsArray[index].getProject().getName();
- ejbBeanNames.addAll(beans);
- ejbComponentNames.addAll(Collections.nCopies(beans.size(), componentName));
- ejbComponentProjectNames.addAll(Collections.nCopies(beans.size(), projectName));
-
- }
- beanList.setData(ejbBeanNames, ejbComponentNames);
- beanList.setInput(ejbBeanNames);
-
- //Cache the results for next time
- EJBTableValues ejbTableValues = new EJBTableValues();
- ejbTableValues.cachedEjbBeanNames = ejbBeanNames;
- ejbTableValues.cachedEjbComponentNames = ejbComponentNames;
- ejbTableValues.cachdedEjbComponentProjectNames = ejbComponentProjectNames;
- ejbValuesByEARSelectionCache.put(cacheKey, ejbTableValues);
- }
-
- public void setInitialSelection(IStructuredSelection initialSelection)
- {
- if (initialSelection != null && !initialSelection.isEmpty())
- {
- Object object = initialSelection.getFirstElement();
- if (object instanceof Session)
- {
- Session session = (Session) object;
- EJBJar jar = session.getEjbJar();
- if (jar != null)
- {
- for (int i = 0; i < earComponents.length; i++)
- {
- IVirtualComponent[] ejbComponents = J2EEUtils.getReferencingEJBComponentsFromEAR(earComponents[i].getProject());
- for (int j=0; j <ejbComponents.length; j++)
- {
- EJBArtifactEdit ejbEdit = null;
- try {
- ejbEdit = EJBArtifactEdit.getEJBArtifactEditForRead(ejbComponents[j]);
- EJBResource ejbRes = ejbEdit.getEJBJarXmiResource();
- if (ejbRes.getEJBJar() == jar)
- {
- earList.setText(earComponents[i].getName());
- setBeanList(earComponents[i]);
- beanList.setSelection(new StructuredSelection(new Integer[]{new Integer(ejbBeanNames.indexOf(session.getName()))}));
- selectedBeanIndex = new Integer(ejbBeanNames.indexOf(session.getName()));
- return;
- }
-
- }
- finally {
- if (ejbEdit!=null)
- ejbEdit.dispose();
- }
-
- }
- }
-
- //Haven't returned yet so we did not find an EAR that contains this EJB. Initialize the page accordingly.
- earList.setText(earList.getItem(0));
- setBeanList(null);
- beanList.setSelection(new StructuredSelection(new Integer[]{new Integer(ejbBeanNames.indexOf(session.getName()))}));
- selectedBeanIndex = new Integer(ejbBeanNames.indexOf(session.getName()));
- }
- }
- else if (object instanceof String)
- displayString_ = (String) object; // save for display use
- }
- }
-
- public IStructuredSelection getObjectSelection()
- {
- String selEJBName = (String) ejbBeanNames.get(selectedBeanIndex
- .intValue());
- if (selEJBName != null) {
- // Get the project containing the bean to get the corresponding
- // Session object.
- // Then return the Session object in an IStructuredSelection.
- String ejbComponentName = (String) ejbComponentNames
- .get(selectedBeanIndex.intValue());
- IVirtualComponent ejbComponent = ComponentUtilities
- .getComponent(ejbComponentName);
- IProject project = ejbComponent.getProject();
- IModelProvider provider = ModelProviderManager
- .getModelProvider(project);
- Object modelObject = provider.getModelObject();
- List sessions = new Vector();
- boolean isJ2EE5 = J2EEProjectUtilities.isJEEProject(project);
- if (isJ2EE5) {
- //a JEE5 project
- EnterpriseBeans eBeans = ((org.eclipse.jst.javaee.ejb.EJBJar)modelObject).getEnterpriseBeans();
- if (eBeans !=null)
- sessions = eBeans.getSessionBeans();
- } else {
- sessions = ((EJBJar) modelObject).getSessionBeans();
- }
- for (Iterator it2 = sessions.iterator(); it2.hasNext();) {
- Object next = (it2.next());
- if (isJ2EE5) {
- SessionBean session = (SessionBean) next;
- if (selEJBName.equals(session.getEjbName()))
- return new StructuredSelection(
- new SessionBean[] { session });
-
- } else {
- Session session = (Session) next;
- if (selEJBName.equals(session.getName()))
- return new StructuredSelection(
- new Session[] { session });
- }
-
- }
- }
- return new StructuredSelection(new Object[0]);
- }
-
- public IProject getProject()
- {
- String projectName = getSelectedProject();
- if (projectName != null && projectName.length() > 0)
- return ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- else
- return null;
- }
-
- public String getComponentName()
- {
- if (selectedBeanIndex != null)
- {
- return (String) (ejbComponentNames.elementAt(selectedBeanIndex.intValue()));
- }
- return null;
- }
-
- public String getObjectSelectionDisplayableString() {
-
- if (ejbBeanNames == null)
- return displayString_;
-
- int index = selectedBeanIndex == null ? 0 : selectedBeanIndex.intValue();
- String bean = (String) ejbBeanNames.get(index);
- return bean == null ? displayString_ : bean;
- }
-
- public IStatus validateSelection(IStructuredSelection objectSelection)
- {
- return Status.OK_STATUS;
- }
-
- public IStatus getStatus()
- {
- if (selectedBeanIndex == null)
- {
- return StatusUtils.errorStatus( "" );
- }
-
- return Status.OK_STATUS;
- }
-
- public Point getWidgetSize() {
- return new Point(450, 350);
- }
-
- private class EJBTableValues
- {
- Vector cachedEjbBeanNames;
- Vector cachedEjbComponentNames;
- Vector cachdedEjbComponentProjectNames;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBTableViewer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBTableViewer.java
deleted file mode 100644
index 155b4f0..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBTableViewer.java
+++ /dev/null
@@ -1,122 +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 141194 joan@ca.ibm.com - Joan Haggarty
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
-
-import java.util.Vector;
-
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-
-public class EJBTableViewer extends TableViewer
-{
- private Vector beanNames;
- private Vector projectNames;
-
- public EJBTableViewer(Composite parent)
- {
- super(parent, SWT.SINGLE | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION);
-
- String columnProperties[] = {ConsumptionUIMessages.TABLE_TITLE_EJB_BEAN_NAMES, ConsumptionUIMessages.TABLE_TITLE_EJB_PROJECT_NAME};
- int columnsWidth[] = {60, 20};
- int columnMins[] = {175, 125};
-
- Table table = getTable();
- table.setHeaderVisible(true);
- table.setLinesVisible(true);
- TableLayout layout = new TableLayout();
- for (int i = 0; i < columnProperties.length; i++)
- {
- TableColumn column = new TableColumn(table, SWT.NONE, i);
- column.setText(columnProperties[i]);
- column.pack();
- layout.addColumnData(new ColumnWeightData(columnsWidth[i], columnMins[i], true));
- }
- table.setLayout(layout);
- setColumnProperties(columnProperties);
- setContentProvider(new EJBContentProvider());
- setLabelProvider(new EJBLabelProvider());
- }
-
- public void setData(Vector beanNames, Vector projectNames)
- {
- this.beanNames = beanNames;
- this.projectNames = projectNames;
- }
- private class EJBLabelProvider extends LabelProvider implements ITableLabelProvider
- {
- public String getColumnText(Object object, int columnIndex)
- {
- String result = null;
- if (object instanceof Integer)
- {
- int index = ((Integer) object).intValue();
- if (columnIndex == 0)
- {
- return (String) (beanNames.elementAt(index));
- }
- else if (columnIndex == 1)
- {
- return (String) (projectNames.elementAt(index));
- }
- }
- return result;
- }
-
- public Image getColumnImage(Object object, int columnIndex)
- {
- return null;
- }
- }
- public class EJBContentProvider implements IStructuredContentProvider
- {
- public Object[] getElements(Object element)
- {
- if (beanNames != null)
- {
- int size = beanNames.size();
- Object[] result = new Object[size];
- for (int index = 0; index < size; index++)
- {
- result[index] = new Integer(index);
- }
- return result;
- }
- return null;
- }
-
- public void dispose()
- {
- }
-
- public void inputChanged(Viewer viewer, Object old, Object newobj)
- {
- }
-
- public boolean isDeleted(Object object)
- {
- return false;
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/HandlerTableItem.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/HandlerTableItem.java
deleted file mode 100644
index a7be6f4..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/HandlerTableItem.java
+++ /dev/null
@@ -1,114 +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.consumption.ui.widgets.object;
-
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-
-
-
-public class HandlerTableItem {
-
- private String handlerClassName;
- private String handlerName;
- private String portName;
- private int index;
-
- private PortComponent port;
- private Object handler;
- private Object wsDescRef;
-
- /**
- * @return Returns the handlerClassName.
- */
- public String getHandlerClassName() {
- return handlerClassName;
- }
- /**
- * @param handlerClassName The handlerClassName to set.
- */
- public void setHandlerClassName(String handlerClassName) {
- this.handlerClassName = handlerClassName;
- }
- /**
- * @return Returns the handlerName.
- */
- public String getHandlerName() {
- return handlerName;
- }
- /**
- * @param handlerName The handlerName to set.
- */
- public void setHandlerName(String handlerName) {
- this.handlerName = handlerName;
- }
- /**
- * @return Returns the port.
- */
- public PortComponent getPort() {
- return port;
- }
- /**
- * @param port The port to set.
- */
- public void setPort(PortComponent port) {
- this.port = port;
- }
- /**
- * @return Returns the handler.
- */
- public Object getHandler() {
- return handler;
- }
- /**
- * @param handler The handler to set.
- */
- public void setHandler(Object handler) {
- this.handler = handler;
- }
- /**
- * @return Returns the portName.
- */
- public String getPortName() {
- return portName;
- }
- /**
- * @param portName The portName to set.
- */
- public void setPortName(String portName) {
- this.portName = portName;
- }
-
- /**
- * @return Returns the index.
- */
- public int getIndex() {
- return index;
- }
- /**
- * @param index The index to set.
- */
- public void setIndex(int index) {
- this.index = index;
- }
- /**
- * @return Returns the wsDescRef.
- */
- public Object getWsDescRef() {
- return wsDescRef;
- }
- /**
- * @param wsDescRef The wsDescRef to set.
- */
- public void setWsDescRef(Object wsDescRef) {
- this.wsDescRef = wsDescRef;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/IObjectSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/IObjectSelectionWidget.java
deleted file mode 100644
index ab80c38..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/IObjectSelectionWidget.java
+++ /dev/null
@@ -1,94 +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
- * -------- -------- -----------------------------------------------------------
- * 20060410 135441 joan@ca.ibm.com - Joan Haggarty
- * 20060420 135912 joan@ca.ibm.com - Joan Haggarty
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataContributor;
-
-/**
- * This interface defines extra methods that Object Selection Widgets
- * need to implement. Object Selection Widgets are displayed on page 2
- * of the Web services wizard.
- */
-public interface IObjectSelectionWidget extends WidgetDataContributor
-{
- /**
- * The framework will call this method to set the initial selection
- * value that the user has specified.
- *
- * @param initialSelection the initial selection the user specified.
- */
- public void setInitialSelection(IStructuredSelection initialSelection);
-
- /**
- * The intent of the Object Selection Widget is that the user has
- * the opportunity change/find the object that they want to turn into
- * a Web service.
- *
- * @return returns the an IStructuredSelection object that the user
- * want to turn into a Web service. This object may be different than
- * the initialSelection passed in by the setInitialSelection method.
- */
- public IStructuredSelection getObjectSelection();
-
- /**
- * Validates whether the objectSelection parameter is valid for
- * this Object selection widget. An error status should be returned
- * if this object is not value. Otherwise, and ok status should be
- * returned
- *
- * @param objectSelection the object to be validated.
- * @return the status of the validation.
- */
- public IStatus validateSelection(IStructuredSelection objectSelection);
-
- /**
- *
- * @return returns the IProject that contains the selection
- * object that the user has chosen with this widget. The value can be
- * null if there is no IProject for this object.
- */
- public IProject getProject();
-
- /**
- *
- * @return returns the name of the IVirtualComponent that contains the selection
- * object that the user has chosen with this widget. The value can be
- * null if there is no IVirtualComponent for this object
- */
- public String getComponentName();
-
- /**
- *
- * @return returns the string to displayed in the UI for the selected object
- */
- public String getObjectSelectionDisplayableString();
-
- /**
- *
- * @return returns the default initial size for the widget to be called from getInitialSize from any parent dialog
- */
- public Point getWidgetSize();
-
- /**
- *
- * @param s A string representation of the object selection
- * @return true if the string represents a valid object selection
- */
- public boolean validate(String s);
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionTransformer.java
deleted file mode 100644
index 8e76b88..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionTransformer.java
+++ /dev/null
@@ -1,87 +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
- * -------- -------- -----------------------------------------------------------
- * 20070116 159618 makandre@ca.ibm.com - Andrew Mak, Project and EAR not defaulted properly when wizard launched from JSR-109 Web services branch in J2EE Project Explorer
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServletLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.PortComponentImpl;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-
-public class JavaBeanSelectionTransformer implements Transformer
-{
- public Object transform(Object value)
- {
- if (value instanceof IStructuredSelection)
- {
- Object sel = ((IStructuredSelection)value).getFirstElement();
- if (sel instanceof IFile)
- {
- return new StructuredSelection(computeFullyQualifiedJavaName((IFile)sel));
- }
- else if (sel instanceof ICompilationUnit)
- {
- IResource res = ((ICompilationUnit)sel).getResource();
- if (res instanceof IFile)
- return new StructuredSelection(computeFullyQualifiedJavaName((IFile)res));
- }
- else if (sel instanceof ServiceImplBean)
- {
- return new StructuredSelection(getBeanName((ServiceImplBean) sel));
- }
- else if(sel instanceof ServletLink)
- {
- return new StructuredSelection(getBeanName((ServletLink) sel));
- }
- }
- return value;
- }
-
- private String computeFullyQualifiedJavaName(IFile resource)
- {
- IPath path = resource.getFullPath();
- String basename = path.lastSegment();
- String beanClass = "";
- if (basename != null && basename.length() > 0)
- {
- String beanPackage = org.eclipse.jst.ws.internal.common.ResourceUtils.getJavaResourcePackageName(path);
- beanClass = (beanPackage == null || beanPackage.length() == 0 ? basename : (beanPackage + "." + basename));
- if (beanClass.toLowerCase().endsWith(".java") || beanClass.toLowerCase().endsWith(".class"))
- beanClass = beanClass.substring(0, beanClass.lastIndexOf('.'));
- }
- return beanClass;
- }
-
- private String getBeanName(ServiceImplBean bean) {
- EObject eObject = bean.eContainer();
- if (eObject instanceof PortComponentImpl) {
- PortComponentImpl pci = (PortComponentImpl) eObject;
- return pci.getServiceEndpointInterface();
- }
- return "";
- }
-
- private String getBeanName(ServletLink link) {
- EObject eObject = link.eContainer();
- if (eObject instanceof ServiceImplBean)
- return getBeanName((ServiceImplBean) eObject);
- return "";
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionWidget.java
deleted file mode 100644
index b8d401a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionWidget.java
+++ /dev/null
@@ -1,281 +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.consumption.ui.widgets.object;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.webservice.wsdd.BeanLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.PortComponentImpl;
-import org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.ServiceImplBeanImpl;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.common.JavaResourceFilter;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.jst.ws.internal.ui.dialog.DialogUtils;
-import org.eclipse.swt.SWT;
-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.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class JavaBeanSelectionWidget extends AbstractObjectSelectionWidget implements IObjectSelectionWidget
-{
- private IProject serverProject_ = null;
- private String serverComponentName_ = null;
- private Composite parent_ = null;
- private JavaResourceFilter filter_ = new JavaResourceFilter();
- private IResource initialResource_ = null;
- private Listener statusListener;
-
- /*CONTEXT_ID PBCL0001 for the Bean Selection Page*/
- private String INFOPOP_PBCL_PAGE = "PBCL0001";
-
- private Text beanClassText_;
- /*CONTEXT_ID PBCL0002 for the Bean Selection field of the Bean Selection Page*/
- private String INFOPOP_PBCL_TEXT_BEAN_CLASS = "PBCL0002";
-
- private Button beanClassBrowseButton_;
- /*CONTEXT_ID PBCL0003 for the Bean Class Browse button of the Bean Selection Page*/
- private String INFOPOP_PBCL_BUTTON_BEAN_CLASS_BROWSE = "PBCL0003";
-
- private Button beanResourceBrowseButton_;
- /*CONTEXT_ID PBCL0004 for the Bean Resource Browse button of the Bean Selection Page*/
- private String INFOPOP_PBCL_BUTTON_BEAN_RESOURCE_BROWSE = "PBCL0004";
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener )
- {
- String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- this.statusListener = statusListener;
- UIUtils uiUtils = new UIUtils( pluginId_ );
-
- parent_ = parent;
-
- Composite group = uiUtils.createComposite( parent, 4 );
-
- group.setToolTipText( ConsumptionUIMessages.TOOLTIP_PBCL_PAGE );
- PlatformUI.getWorkbench().getHelpSystem().setHelp( group, pluginId_ + "." + INFOPOP_PBCL_PAGE );
-
- beanClassText_ = uiUtils.createText( group, ConsumptionUIMessages.LABEL_BEAN_CLASS_NAME,
- ConsumptionUIMessages.TOOLTIP_PBCL_TEXT_BEAN_CLASS,
- INFOPOP_PBCL_TEXT_BEAN_CLASS,
- SWT.SINGLE | SWT.BORDER);
- beanClassText_.addModifyListener(
- new ModifyListener()
- {
- public void modifyText(ModifyEvent e)
- {
- handleModifyBeanClassText();
- }
- }
- );
-
- beanClassBrowseButton_ = uiUtils.createPushButton( group, ConsumptionUIMessages.BUTTON_BROWSE_CLASSES,
- ConsumptionUIMessages.TOOLTIP_PBCL_BUTTON_BEAN_CLASS_BROWSE,
- INFOPOP_PBCL_BUTTON_BEAN_CLASS_BROWSE );
- beanClassBrowseButton_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleBrowseClasses();
- }
- } );
-
- beanResourceBrowseButton_ = uiUtils.createPushButton( group, ConsumptionUIMessages.BUTTON_BROWSE_FILES,
- ConsumptionUIMessages.TOOLTIP_PBCL_BUTTON_BEAN_RESOURCE_BROWSE,
- INFOPOP_PBCL_BUTTON_BEAN_RESOURCE_BROWSE );
- beanResourceBrowseButton_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleBrowseFiles();
- }
- } );
- return this;
- }
-
- private void handleModifyBeanClassText()
- {
- statusListener.handleEvent(null);
- serverProject_ = null;
- serverComponentName_ = null;
- }
-
- private void handleBrowseClasses()
- {
- Shell shell = parent_.getShell();
- IType itype = DialogUtils.browseClassesAsIType(shell, ResourcesPlugin.getWorkspace().getRoot().getProjects(), new ProgressMonitorDialog(shell));
- if (itype != null)
- {
- beanClassText_.setText(itype.getFullyQualifiedName());
- try
- {
- IResource res = itype.getCorrespondingResource();
- if (res != null)
- {
- serverProject_ = res.getProject();
- IVirtualComponent comp = ResourceUtils.getComponentOf(res);
- if (comp!=null)
- {
- serverComponentName_ = comp.getName();
- }
- }
- else
- {
- serverProject_ = null;
- serverComponentName_ = null;
- }
- }
- catch (JavaModelException jme)
- {
- serverProject_ = null;
- serverComponentName_ = null;
- }
- }
- }
-
- private void handleBrowseFiles()
- {
- IResource topResource = ResourceUtils.getWorkspaceRoot();
- IResource resource = DialogUtils.browseResources( parent_.getShell(), topResource, initialResource_, filter_ );
- setBeanClass(resource);
- }
-
- private void setBeanClass(IResource resource)
- {
- if( resource != null && resource instanceof IFile )
- {
- IPath path = resource.getFullPath();
- String basename = path.lastSegment();
-
- if( basename != null && basename.length() > 0 )
- {
- String beanPackage = org.eclipse.jst.ws.internal.common.ResourceUtils.getJavaResourcePackageName(path);
- String beanClass = (beanPackage == null || beanPackage.length() == 0 ? basename : (beanPackage + "." + basename));
-
- if( beanClass.toLowerCase().endsWith(".java") || beanClass.toLowerCase().endsWith(".class" ) )
- {
- beanClass = beanClass.substring( 0, beanClass.lastIndexOf('.') );
- }
-
- beanClassText_.setText(beanClass);
- serverProject_ = ResourceUtils.getProjectOf(path);
- IVirtualComponent comp = ResourceUtils.getComponentOf(resource);
-
- if (comp!=null)
- {
- serverComponentName_ = comp.getName();
- }
-
- }
- }
- }
-
- private void setBeanClass(ServiceImplBeanImpl serviceImpl)
- {
- if( serviceImpl != null )
- {
- EObject eObject = serviceImpl.eContainer();
- if(eObject instanceof PortComponentImpl){
- PortComponentImpl pci = (PortComponentImpl)eObject;
- String beanClass = pci.getServiceEndpointInterface();
- beanClassText_.setText(beanClass);
- }
- }
- }
-
- private void setBeanClass(BeanLink serviceImpl)
- {
- if( serviceImpl != null )
- {
- EObject eObject = serviceImpl.eContainer();
- if(eObject instanceof ServiceImplBeanImpl){
- setBeanClass((ServiceImplBeanImpl)eObject);
- }
- }
- }
-
- public void setInitialSelection(IStructuredSelection initialSelection)
- {
- if (initialSelection != null && !initialSelection.isEmpty())
- {
- Object object = initialSelection.getFirstElement();
- if (object instanceof IFile)
- {
- IFile iFile = (IFile)object;
- String fileExt = iFile.getFileExtension().toLowerCase();
- if (fileExt.equals("java") || fileExt.equals("class"))
- setBeanClass(iFile);
- }
- else if (object instanceof ICompilationUnit)
- setBeanClass(((ICompilationUnit)object).getResource());
- else if (object instanceof ServiceImplBeanImpl)
- setBeanClass((ServiceImplBeanImpl)object);
- else if(object instanceof BeanLink)
- setBeanClass((BeanLink)object);
- }
- }
-
- public IStructuredSelection getObjectSelection()
- {
- return new StructuredSelection(beanClassText_.getText());
- }
-
- public IProject getProject()
- {
- return serverProject_;
- }
-
- public String getComponentName()
- {
- return serverComponentName_;
- }
-
- public IStatus getStatus()
- {
- String beanClassName = beanClassText_.getText().trim();
- if (beanClassName == null || beanClassName.length() <= 0)
- {
- return StatusUtils.errorStatus(ConsumptionUIMessages.PAGE_MSG_BEAN_CANNOT_BE_EMPTY);
- }
- return Status.OK_STATUS;
- }
-
- public IStatus validateSelection(IStructuredSelection objectSelection)
- {
- return Status.OK_STATUS;
- }
-
- public String getObjectSelectionDisplayableString() {
- // TODO Auto-generated method stub
- return "Java bean string ";
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionFragment.java
deleted file mode 100644
index ec77dc7..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionFragment.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
-
-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.data.TypeRuntimeServer;
-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;
-import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-
-public class ObjectSelectionFragment extends SequenceFragment implements Condition
-{
- private TypeRuntimeServer typeRuntimeServer;
- private boolean hasObjectSelectionWidget;
-
- public ObjectSelectionFragment()
- {
- super();
- BooleanFragment boolFragment = new BooleanFragment(new SimpleFragment("ObjectSelectionWidget"), new SimpleFragment(""), this);
- add(boolFragment);
- add(new SimpleFragment(new ObjectSelectionOutputCommand(), ""));
- hasObjectSelectionWidget = false;
- }
-
- /**
- * This method is called retrieve the data mappings for this command fragment.
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ObjectSelectionWidget.class );
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ObjectSelectionOutputCommand.class, "ObjectSelection", null);
- dataRegistry.addMapping(ObjectSelectionFragment.class, "TypeRuntimeServer", ObjectSelectionWidget.class);
- dataRegistry.addMapping(ObjectSelectionFragment.class, "TypeRuntimeServer", ObjectSelectionOutputCommand.class);
-
- dataRegistry.addMapping(ObjectSelectionWidget.class, "ObjectSelection", ObjectSelectionOutputCommand.class);
- dataRegistry.addMapping(ObjectSelectionWidget.class, "Project", ObjectSelectionOutputCommand.class);
- dataRegistry.addMapping(ObjectSelectionWidget.class, "ComponentName", ObjectSelectionOutputCommand.class);
- }
-
- public boolean evaluate()
- {
- return hasObjectSelectionWidget;
- }
-
- public TypeRuntimeServer getTypeRuntimeServer()
- {
- return typeRuntimeServer;
- }
-
- /**
- * @param typeRuntimeServer The typeRuntimeServer to set.
- */
- public void setTypeRuntimeServer(TypeRuntimeServer typeRuntimeServer)
- {
- this.typeRuntimeServer = typeRuntimeServer;
- if (typeRuntimeServer != null)
- {
- String wst = typeRuntimeServer.getTypeId();
-
- int scenario = WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(wst);
- String implId = WebServiceRuntimeExtensionUtils2.getWebServiceImplIdFromTypeId(wst);
- if (scenario == WebServiceScenario.TOPDOWN)
- {
- //Must have WSDL object selection. No choice.
- hasObjectSelectionWidget=true;
- }
- else
- {
- WebServiceImpl wsimpl = WebServiceRuntimeExtensionUtils2.getWebServiceImplById(implId);
- if (wsimpl!=null)
- {
- String objectSelectionWidgetId = wsimpl.getObjectSelectionWidget();
- hasObjectSelectionWidget = objectSelectionWidgetId != null && objectSelectionWidgetId.length() > 0;
- }
- }
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionOutputCommand.java
deleted file mode 100644
index 5378e11..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionOutputCommand.java
+++ /dev/null
@@ -1,296 +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
- * -------- -------- -----------------------------------------------------------
- * 20060830 155114 pmoogk@ca.ibm.com - Peter Moogk, Updated patch for this defect.
- * 20070116 159618 makandre@ca.ibm.com - Andrew Mak, Project and EAR not defaulted properly when wizard launched from JSR-109 Web services branch in J2EE Project Explorer
- * 20070326 171071 makandre@ca.ibm.com - Andrew Mak, Create public utility method for copying WSDL files
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
-
-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.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-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.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-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.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.ws.internal.util.UniversalPathTransformer;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-
-public class ObjectSelectionOutputCommand extends AbstractDataModelOperation
-{
- private String objectSelectionWidgetId_;
- private IStructuredSelection objectSelection_;
- private IObjectSelectionWidget objectSelectionWidget_;
- private IProject project_;
- private String componentName_;
- private WebServicesParser parser_;
-
- private boolean topDown_ = false;
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
-
- // Transformation
- if (objectSelectionWidgetId_ != null && objectSelectionWidgetId_.length() > 0)
- {
- Transformer transformer = ObjectSelectionRegistry.getInstance().getTransformer(objectSelectionWidgetId_);
- Object transformedSelection = transformer == null ? null : transformer.transform(objectSelection_);
-
- if (transformedSelection instanceof IStructuredSelection)
- {
- objectSelection_ = (IStructuredSelection)transformedSelection;
- }
- }
-
- // Validation
- IStatus status = (objectSelectionWidget_ != null) ? objectSelectionWidget_.validateSelection(getObjectSelection()) : Status.OK_STATUS;
- if (status.getSeverity() != Status.OK && env != null)
- {
- try
- {
- env.getStatusHandler().report(status);
- }
- catch (StatusException se)
- {
- }
- }
-
- return status;
- }
-
- /**
- * @param typeRuntimeServer The typeRuntimeServer to set.
- */
- public void setTypeRuntimeServer(TypeRuntimeServer typeRuntimeServer)
- {
- if (typeRuntimeServer != null)
- {
- String wst = typeRuntimeServer.getTypeId();
-
- int scenario = WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(wst);
- String implId = WebServiceRuntimeExtensionUtils2.getWebServiceImplIdFromTypeId(wst);
-
- WebServiceImpl wsimpl = WebServiceRuntimeExtensionUtils2.getWebServiceImplById(implId);
- //IWebServiceType wst = WebServiceRuntimeExtensionUtils2.getWebServiceTypeById(typeRuntimeServer.getTypeId());
-
- if (wsimpl != null)
- {
- String objectSelectionWidgetId = null;
- if (scenario == WebServiceScenario.TOPDOWN)
- {
- objectSelectionWidgetId = "org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget";
- topDown_ = true;
- }
- else
- {
- objectSelectionWidgetId = wsimpl.getObjectSelectionWidget();
- }
-
- objectSelectionWidgetId_ = objectSelectionWidgetId;
-
- Object object = ObjectSelectionRegistry.getInstance().getSelectionWidget(objectSelectionWidgetId_);
-
- if( object instanceof IObjectSelectionWidget )
- {
- objectSelectionWidget_ = (IObjectSelectionWidget)object;
- }
- }
- }
- }
-
- /**
- * @return Returns the selection.
- */
- public IStructuredSelection getObjectSelection()
- {
- return objectSelection_;
- }
- /**
- * @param selection The selection to set.
- */
- public void setObjectSelection(IStructuredSelection objectSelection)
- {
- objectSelection_ = objectSelection;
-
- //Set the project if you can
- if (project_==null)
- {
- project_ = getProjectFromObjectSelection(objectSelection);
- }
-
- //Set the componentName if you can
- if (componentName_ == null)
- {
- componentName_ = getComponentNameFromObjectSelection(objectSelection);
- }
-
- // Check if this is a WSDL selection object. If it is we need
- // to unwrap it.
- if( objectSelection != null && !objectSelection.isEmpty() )
- {
- Object object = objectSelection.getFirstElement();
-
- if( object instanceof WSDLSelectionWrapper )
- {
- WSDLSelectionWrapper wsdlWrapper = (WSDLSelectionWrapper)object;
-
- objectSelection_ = wsdlWrapper.wsdlSelection;
- parser_ = wsdlWrapper.parser;
- }
- }
- }
-
- public IProject getProject()
- {
- if (project_ == null && topDown_)
- project_ = getProjectFromTransformedSelection();
- return project_;
- }
-
- public void setProject(IProject project)
- {
- this.project_ = project;
- }
-
- public String getComponentName()
- {
- if (componentName_ == null && topDown_)
- componentName_ = getComponentNameFromTransformedSelection();
- return componentName_;
- }
-
- public void setComponentName(String componentName)
- {
- this.componentName_ = componentName;
- }
-
- /**
- * @return Returns the parser_.
- */
- public WebServicesParser getWebServicesParser()
- {
- return parser_;
- }
-
- private boolean hasProtocol(String url) {
- return url.indexOf(":") != -1;
- }
-
- private IResource findResourceFromSelection(Object selection) throws CoreException {
-
- IResource resource = ResourceUtils.getResourceFromSelection(selection);
-
- // try finding at least the project using the EMF way
- if (resource == null && selection instanceof EObject)
- resource = ProjectUtilities.getProject(selection);
-
- return resource;
- }
-
- private IProject getProjectFromTransformedSelection() {
- if (objectSelection_ != null && objectSelection_.size() == 1)
- {
- Object obj = objectSelection_.getFirstElement();
- if (obj instanceof String) {
- String str = UniversalPathTransformer.toPath((String) obj);
- if (hasProtocol(str)) return null;
- return ResourceUtils.getProjectOf(new Path(str));
- }
- }
- return null;
- }
-
- private IProject getProjectFromObjectSelection(IStructuredSelection selection)
- {
- if (selection != null && selection.size() == 1)
- {
- Object obj = selection.getFirstElement();
- if (obj != null)
- {
- try
- {
- IResource resource = findResourceFromSelection(obj);
- if (resource==null)
- return null;
- if (resource instanceof IProject)
- return (IProject) resource;
- IProject p = ResourceUtils.getProjectOf(resource.getFullPath());
- return p;
- } catch(CoreException e)
- {
- e.printStackTrace();
- return null;
- }
- }
- }
- return null;
- }
-
- private String getComponentNameFromTransformedSelection() {
- if (objectSelection_ != null && objectSelection_.size() == 1)
- {
- Object obj = objectSelection_.getFirstElement();
- if (obj instanceof String) {
- String str = UniversalPathTransformer.toPath((String) obj);
- if (hasProtocol(str)) return null;
- IVirtualComponent comp = ResourceUtils.getComponentOf(new Path(str));
- return comp == null ? null : comp.getName();
- }
- }
- return null;
- }
-
- private String getComponentNameFromObjectSelection(IStructuredSelection selection)
- {
- if (selection != null && selection.size() == 1)
- {
- Object obj = selection.getFirstElement();
- if (obj != null)
- {
- try
- {
- IResource resource = findResourceFromSelection(obj);
- if (resource==null)
- return null;
-
- IVirtualComponent comp = ResourceUtils.getComponentOf(resource);
-
- if (comp!=null)
- {
- return comp.getName();
- }
- } catch(CoreException e)
- {
- e.printStackTrace();
- return null;
- }
- }
- }
- return null;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionRegistry.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionRegistry.java
deleted file mode 100644
index e6b2918..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionRegistry.java
+++ /dev/null
@@ -1,157 +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
- * -------- -------- -----------------------------------------------------------
- * 20060825 155114 pmoogk@ca.ibm.com - Peter Moogk
- * 20060830 155114 pmoogk@ca.ibm.com - Peter Moogk, Updated patch for this defect.
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
-
-import java.util.Hashtable;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.IObjectSelectionLaunchable;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-
-public class ObjectSelectionRegistry
-{
- private static ObjectSelectionRegistry instance;
- private IConfigurationElement[] elements;
- private Hashtable cachedSelectionWidgets;
-
- private ObjectSelectionRegistry()
- {
- elements = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.jst.ws.consumption.ui", "objectSelectionWidget");
- cachedSelectionWidgets = new Hashtable();
- }
-
- public static ObjectSelectionRegistry getInstance()
- {
- if (instance == null)
- {
- instance = new ObjectSelectionRegistry();
- }
-
- return instance;
- }
-
- /**
- *
- * @param id if the selection widget object.
- * @return returns the transformer class if has been specified. Otherwise
- * null is returned.
- */
- public Transformer getTransformer( String id )
- {
- TableEntry entry = getTableEntry( id );
- Transformer result = null;
-
- if( entry != null )
- {
- try
- {
- Object object = entry.element.createExecutableExtension("transformer");
-
- if( object instanceof Transformer )
- {
- result = (Transformer)object;
- }
- }
- catch( CoreException exc ){}
- }
-
- return result;
- }
-
- /**
- *
- * @param id if the selection widget object.
- * @return returns the value of the external modify attribute if
- * it has been specified. Otherwise false is returned.
- */
- public boolean getExternalModify( String id )
- {
- TableEntry entry = getTableEntry( id );
- boolean result = false;
-
- if( entry != null )
- {
- String modifyString = entry.element.getAttribute("external_modify");
-
- result = new Boolean( modifyString ).booleanValue();
- }
-
- return result;
- }
-
- /**
- * Gets the IObjectSelectionWidget based on the selectionId. If one is
- * not found null is returned.
- *
- * @param selectionId the ID of the selection widget.
- * @return returns the registered IObjectSelectionWidget object.
- */
- public Object getSelectionWidget( String selectionId )
- {
- TableEntry entry = getTableEntry( selectionId );
-
- return entry == null ? null : entry.objectSelection;
- }
-
- public void cleanup()
- {
- instance = null;
- elements = null;
- cachedSelectionWidgets = null;
- }
-
- private TableEntry getTableEntry( String id )
- {
- if( id == null ) return null;
-
- TableEntry entry = (TableEntry)cachedSelectionWidgets.get( id );
-
- if( entry == null )
- {
- for( int index = 0; index < elements.length; index++ )
- {
- IConfigurationElement element = elements[index];
- String elemId = element.getAttribute( "id" );
-
- if( id.equals( elemId ) )
- {
- try
- {
- Object object = element.createExecutableExtension("class");
-
- if( object instanceof IObjectSelectionWidget || object instanceof IObjectSelectionLaunchable )
- {
- entry = new TableEntry();
- entry.element = element;
- entry.objectSelection = object;
- cachedSelectionWidgets.put( id, entry );
- break;
- }
- }
- catch( CoreException exc ){}
- }
- }
- }
-
- return entry;
- }
-
- private class TableEntry
- {
- public IConfigurationElement element;
- public Object objectSelection;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionWidget.java
deleted file mode 100644
index 1a1a597..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionWidget.java
+++ /dev/null
@@ -1,258 +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
- * -------- -------- -----------------------------------------------------------
- * 20060224 129387 pmoogk@ca.ibm.com - Peter Moogk
- * 20060410 135441 joan@ca.ibm.com - Joan Haggarty
- * 20060825 155114 pmoogk@ca.ibm.com - Peter Moogk
- * 20061220 161232 makandre@ca.ibm.com - Andrew Mak, AbstractObjectSelectionWidget.setInitialSelection(IStructuredSelection initialSelection) called twice each time Browse pressed
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
-
-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.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-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.data.TypeRuntimeServer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-
-public class ObjectSelectionWidget extends AbstractObjectSelectionWidget implements IObjectSelectionWidget
-{
- private Composite parent;
- private Listener statusListener;
- private Composite composite;
- private IProject project;
- private String componentName;
- private IObjectSelectionWidget child;
- private Point widgetSize_;
-
- public WidgetDataEvents addControls(Composite parentComposite, Listener statListener)
- {
- this.parent = parentComposite;
- this.statusListener = statListener;
- composite = null;
- return this;
- }
-
- public Control getControl(){
- return composite;
- }
-
- /**
- * @param typeRuntimeServer The typeRuntimeServer to set.
- */
- public void setTypeRuntimeServer(TypeRuntimeServer typeRuntimeServer)
- {
- if (composite != null)
- {
- composite.dispose();
- child = null;
- }
- if (typeRuntimeServer != null)
- {
- String wst = typeRuntimeServer.getTypeId();
- int scenario = WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(wst);
- String implId = WebServiceRuntimeExtensionUtils2.getWebServiceImplIdFromTypeId(wst);
- WebServiceImpl wsimpl = WebServiceRuntimeExtensionUtils2.getWebServiceImplById(implId);
-
- //IWebServiceType wst = WebServiceRuntimeExtensionUtils.getWebServiceTypeById(typeRuntimeServer.getTypeId());
- 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();
- }
-
- Object object = ObjectSelectionRegistry.getInstance().getSelectionWidget( objectSelectionWidgetId );
-
- if( object instanceof IObjectSelectionWidget )
- {
- child = (IObjectSelectionWidget)object;
- }
-
- if( child != null )
- {
- Control shell = parent.getShell();
- composite = new Composite(parent, SWT.NONE);
- GridLayout gl = new GridLayout();
- gl.marginHeight = 0;
- gl.marginWidth = 0;
- GridData gd = new GridData(GridData.FILL_BOTH);
- composite.setLayout(gl);
- composite.setLayoutData(gd);
- child.addControls(composite, statusListener);
-
- Point origSize = shell.getSize();
- Point compSize = composite.computeSize(SWT.DEFAULT, SWT.DEFAULT);
- int newX = origSize.x;
- int newY = origSize.y;
-
- // Note: we are trying to determine here if the wizard page should
- // be resized based on the size of the control that is
- // given to us by the extension. The hard coded constants
- // below represent the vertical and horizontal pixels that need
- // to go around object selection control. Hopefully, a more
- // programatic method of doing this can be found in the future.
- if( compSize.x + 20 > origSize.x )
- {
- newX = compSize.x + 20;
- }
-
- if( compSize.y + 205 > origSize.y )
- {
- newY = compSize.y + 205;
- }
-
- widgetSize_ = new Point(newX, newY);
-
- return;
- }
- }
- }
- }
-
- public IStatus getStatus()
- {
- return (child != null) ? child.getStatus() : Status.OK_STATUS;
- }
-
- public void setInitialSelection(IStructuredSelection initialSelection)
- {
- project = getProjectFromInitialSelection(initialSelection);
- componentName = getComponentNameFromInitialSelection(initialSelection);
- if (child != null)
- child.setInitialSelection(initialSelection);
- }
-
- public IStructuredSelection getObjectSelection()
- {
- return (child != null) ? child.getObjectSelection() : null;
- }
-
- public IStatus validateSelection(IStructuredSelection objectSelection)
- {
- return (child != null) ? child.validateSelection(objectSelection) : Status.OK_STATUS;
- }
-
- public IProject getProject()
- {
- if (child != null)
- {
- IProject p = child.getProject();
- if (p != null)
- return p;
- else
- return project;
- }
- else
- {
- return null;
- }
- }
-
- public String getComponentName()
- {
- if (child != null)
- {
- String cname = child.getComponentName();
- if (cname != null && cname.length()>0)
- return cname;
- else
- return componentName;
- }
- else
- {
- return null;
- }
-
- }
-
- private IProject getProjectFromInitialSelection(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;
- }
-
- private String getComponentNameFromInitialSelection(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;
-
- IVirtualComponent comp = ResourceUtils.getComponentOf(resource);
- if (comp != null)
- {
- return comp.getName();
- }
- } catch(CoreException e)
- {
- return null;
- }
- }
- }
- return null;
- }
-
- public String getObjectSelectionDisplayableString() {
- return child.getObjectSelectionDisplayableString();
- }
-
- public Point getWidgetSize()
- {
- Point childWidgetSize = child.getWidgetSize();
- if (childWidgetSize == null)
- return widgetSize_;
- return childWidgetSize;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/Timer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/Timer.java
deleted file mode 100644
index 165067d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/Timer.java
+++ /dev/null
@@ -1,75 +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
- * -------- -------- -----------------------------------------------------------
- * 20060803 152486 makandre@ca.ibm.com - Andrew Mak, Typing WSDL in Service definition field is very slow
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
-
-import java.util.Calendar;
-import org.eclipse.swt.widgets.Display;
-
-public class Timer extends Thread
-{
- private final long ONE_SECOND = 1000;
- private long refreshTime;
- private boolean isRunning = true;
- private Display display;
- private Runnable runnable;
-
- private Timer(Display display, Runnable runnable)
- {
- this.display = display;
- this.runnable = runnable;
- }
-
- public synchronized static Timer newInstance(Timer timer, Display display, Runnable runnable)
- {
- if (!Timer.isRunning(timer))
- return new Timer(display, runnable);
-
- return timer;
- }
-
- public synchronized static boolean isRunning(Timer timer)
- {
- return timer != null && timer.isRunning;
- }
-
- public synchronized void startTimer()
- {
- refreshTime = getCurrentTime() + ONE_SECOND;
- if (!isAlive())
- this.start();
- }
-
- private long getCurrentTime()
- {
- return Calendar.getInstance().getTime().getTime();
- }
-
- public void run()
- {
- long currTime = getCurrentTime();
- while (currTime < refreshTime)
- {
- try
- {
- sleep(refreshTime - currTime);
- }
- catch (InterruptedException ie)
- {
- }
- currTime = getCurrentTime();
- }
- isRunning = false;
- display.syncExec(runnable);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ValidateWSDLJob.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ValidateWSDLJob.java
deleted file mode 100644
index e27ee08..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ValidateWSDLJob.java
+++ /dev/null
@@ -1,88 +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.consumption.ui.widgets.object;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.wst.wsdl.validation.internal.IValidationMessage;
-import org.eclipse.wst.wsdl.validation.internal.IValidationReport;
-import org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLValidator;
-
-
-
-public class ValidateWSDLJob extends Job {
-
- final public static String VALIDATE_WSDL_JOB_FAMILY = "ValidateWSDLJobJamily";
-
- private String wsdlURI_ = null;
- private IValidationMessage[] validationMessages_ = null;
- private int validationMessageSeverity_ = -1; // default value
-
- public ValidateWSDLJob(String wsdlURI) {
- super("ValidateWSDLJob");
- wsdlURI_ = wsdlURI;
- }
-
- protected IStatus run(IProgressMonitor monitor) {
- WSDLValidator wsdlValidator = WSDLValidator.getInstance();
- IValidationReport valReport = wsdlValidator.validate(wsdlURI_);
- validationMessages_ = valReport.getValidationMessages();
- reportSummary();
- return Status.OK_STATUS;
- }
-
- // calculate the higher severity for all the validation messages
- private void reportSummary() {
- int i;
- int severity;
- int errorCount = 0;
- int warningCount = 0;
- for (i=0; i<validationMessages_.length && errorCount == 0; i++) {
- severity = validationMessages_[i].getSeverity();
- switch (severity) {
- case IValidationMessage.SEV_ERROR:
- errorCount++;
- break;
- case IValidationMessage.SEV_WARNING:
- warningCount++;
- break;
- default:
- break;
- }
- }
- if (errorCount > 0) {
- validationMessageSeverity_ = IValidationMessage.SEV_ERROR;
- } else if (warningCount > 0) {
- validationMessageSeverity_ = IValidationMessage.SEV_WARNING;
- }
-
- }
-
- public boolean belongsTo(Object family)
- {
- return family == VALIDATE_WSDL_JOB_FAMILY;
- }
-
- public IValidationMessage[] getValidationMessages() {
- return validationMessages_;
- }
-
- public int getValidationMessageSeverity() {
- return validationMessageSeverity_;
- }
-
- public String getWsdlURI() {
- return wsdlURI_;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ValidationMessageViewerWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ValidationMessageViewerWidget.java
deleted file mode 100644
index 177f5dc..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ValidationMessageViewerWidget.java
+++ /dev/null
@@ -1,244 +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
- * -------- -------- -----------------------------------------------------------
- * 20060310 131352 pmoogk@ca.ibm.com - Peter Moogk
- * 20060411 136134 kathy@ca.ibm.com - Kathy Chan
- * 20060420 136221 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.IContentProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.ISharedImages;
-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;
-import org.eclipse.wst.wsdl.validation.internal.IValidationMessage;
-
-
-public class ValidationMessageViewerWidget extends SimpleWidgetDataContributor
-{
- private int DEFAULT_TABLE_HEIGHT_HINT = 100;
- private TableViewer tableViewer_;
- private Table table_;
- private String message = null;
- static final String columns_[] = {ConsumptionUIMessages.TABLE_COLUMN_VALIDATION_SEVERITY,
- ConsumptionUIMessages.TABLE_COLUMN_VALIDATION_LINE,
- ConsumptionUIMessages.TABLE_COLUMN_VALIDATION_COLUMN,
- ConsumptionUIMessages.TABLE_COLUMN_VALIDATION_MESSAGE};
- static final int columnsWidth_[] = {12, 10, 10, 60};
- static final int columnMins_[] = {60, 50, 50, 300};
-
-
-
- public ValidationMessageViewerWidget()
- {
- }
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener )
- {
-
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout gl = new GridLayout();
-
- gl.marginHeight = 0;
- gl.marginWidth = 0;
- composite.setLayout(gl);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- Text messageLabel = new Text( composite, SWT.READ_ONLY);
- messageLabel.setText( ConsumptionUIMessages.LABEL_VALIDATE_MESSAGES);
- GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- messageLabel.setLayoutData(gd);
- messageLabel.setToolTipText( ConsumptionUIMessages.TOOLTIP_VALIDATE_TEXT_MESSAGE );
-
- table_ = new Table(composite, SWT.SINGLE | SWT.FULL_SELECTION | SWT.BORDER);
- gd = new GridData(GridData.FILL_BOTH);
- gd.heightHint = DEFAULT_TABLE_HEIGHT_HINT;
- table_.setLayoutData(gd);
- table_.setHeaderVisible(true);
- table_.setLinesVisible(true);
- table_.setToolTipText(ConsumptionUIMessages.TOOLTIP_TABLE_VALIDATE_MESSAGE );
- TableLayout tableLayout = new TableLayout();
- for (int i = 0; i < columns_.length; i++)
- {
- TableColumn tableColumn = new TableColumn(table_, SWT.NONE);
- tableColumn.setText(columns_[i]);
- tableColumn.pack();
- ColumnWeightData columnData = new ColumnWeightData(columnsWidth_[i], columnMins_[i], true);
- tableLayout.addColumnData(columnData);
- }
- table_.setLayout(tableLayout);
-
- tableViewer_ = new TableViewer(table_);
-
- tableViewer_.setContentProvider(new ListContentProvider());
- tableViewer_.setLabelProvider(new ListLabelProvider());
-
- return this;
- }
-
- public void setInput(IValidationMessage[] messages)
- {
- tableViewer_.setInput(messages);
- tableViewer_.refresh();
- }
-
- public void clearInput()
- {
- IValidationMessage emptyMessages[] = {};
- this.setInput(emptyMessages);
- }
-
- public IContentProvider getContentProvider()
- {
- return tableViewer_.getContentProvider();
- }
-
- public IStatus getStatus()
- {
- return message == null ? Status.OK_STATUS :
- StatusUtils.errorStatus(message );
- }
-
- public void refresh()
- {
- tableViewer_.refresh();
- }
-
- public TableItem[] getItems()
- {
- //internalRefresh();
- return table_.getItems();
- }
-
- public void setEnabled(boolean enabled)
- {
- }
-
- public void dispose()
- {
- if (table_ != null)
- table_.dispose();
- }
-
- protected class ListContentProvider implements IStructuredContentProvider
- {
- public void dispose()
- {
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
- {
- tableViewer_.add(getElements(newInput));
- }
-
- public Object[] getElements(Object inputElement)
- {
- if (inputElement instanceof IValidationMessage[])
- {
- IValidationMessage[] valMessages = (IValidationMessage[]) inputElement;
- return valMessages;
- }
- else
- return new Object[0];
- }
- }
-
- protected class ListLabelProvider implements ITableLabelProvider
- {
- public Image getColumnImage(Object element, int columnIndex)
- {
- if (element instanceof IValidationMessage)
- {
- IValidationMessage msg = (IValidationMessage) element;
-
- if (columnIndex == 0)
- {
- int severity = msg.getSeverity();
- if (severity == 0) {
- return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
- } else if (severity == 1) {
- return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_WARN_TSK);
- } else if (severity == 2) {
- return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_INFO_TSK);
- }
- }
- }
- return null;
- }
-
- public String getColumnText(Object element, int columnIndex)
- {
- String text = "";
- if (element instanceof IValidationMessage)
- {
- IValidationMessage msg = (IValidationMessage) element;
-
- switch (columnIndex) {
- case 0:
- // no text to display, only display severity as image
- break;
- case 1:
- text = (new Integer(msg.getLine())).toString();
- break;
- case 2:
- text = (new Integer(msg.getColumn())).toString();
- break;
- case 3:
- text = msg.getMessage();
- break;
-
- default:
- break;
- }
- }
- return text;
- }
-
- public void addListener(ILabelProviderListener listener)
- {
- }
-
- public void removeListener(ILabelProviderListener listener)
- {
- }
-
- public boolean isLabelProperty(Object element, String property)
- {
- return true;
- }
-
- public void dispose()
- {
- }
- }
- }
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionTransformer.java
deleted file mode 100644
index d98c208..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionTransformer.java
+++ /dev/null
@@ -1,147 +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
- * -------- -------- -----------------------------------------------------------
- * 20070116 159618 makandre@ca.ibm.com - Andrew Mak, Project and EAR not defaulted properly when wizard launched from JSR-109 Web services branch in J2EE Project Explorer
- * 20070327 172339 kathy@ca.ibm.com - Kathy Chan
- * 20070713 191357 kathy@ca.ibm.com - Kathy Chan
- * 20081208 257618 mahutch@ca.ibm.com - Mark Hutchinson, Add Mechanism for Adopters to map Services to WSDL URLs
- * 20090310 242440 yenlu@ca.ibm.com - Yen Lu, Pluggable IFile to URI Converter
- * 20100209 302009 mahutch@ca.ibm.com - Mark Hutchinson, ClassCastException when org.eclipse.wst.ws.ifile2uriconverter plugged in
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
-
-import java.net.MalformedURLException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.ServiceRefImpl;
-import org.eclipse.jst.j2ee.webservice.wsdd.BeanLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.ws.internal.common.J2EEActionAdapterFactory;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-import org.eclipse.wst.ws.internal.converter.IIFile2UriConverter;
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-import org.eclipse.wst.ws.internal.ui.utils.AdapterUtils;
-import org.eclipse.wst.ws.internal.wsfinder.WSDLURLStringWrapper;
-import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-public class WSDLSelectionTransformer implements Transformer
-{
- public Object transform(Object value)
- {
- if (value instanceof IStructuredSelection)
- {
- IStructuredSelection selection = (IStructuredSelection)value;
- if (selection != null && !selection.isEmpty()) {
-
- Object sel = selection.getFirstElement();
- if (sel instanceof IResource)
- {
- try
- {
- if (sel instanceof IFile)
- {
- IFile file = (IFile)sel;
- IIFile2UriConverter converter = WSPlugin.getInstance().getIFile2UriConverter();
- if (converter != null)
- {
- String wsdlUrl = converter.convert(file);
- if (wsdlUrl != null || !converter.allowBaseConversionOnFailure())
- return new StructuredSelection(wsdlUrl);
- }
- }
- return new StructuredSelection(((IResource)sel).getLocation().toFile().toURL().toString());
- }
- catch (MalformedURLException murle)
- {
- }
- }
- else if (Platform.getAdapterManager().hasAdapter(sel, WSDLURLStringWrapper.class.getName())) {
- Object adaptedObject = Platform.getAdapterManager().loadAdapter(sel, WSDLURLStringWrapper.class.getName());
- WSDLURLStringWrapper wrapper = (WSDLURLStringWrapper)adaptedObject;
- return new StructuredSelection(wrapper.getWSDLURLString());
- }
- else if (sel instanceof ServiceImpl)
- {
- return new StructuredSelection(J2EEActionAdapterFactory.getWSDLURI((ServiceImpl)sel));
- }
- else if (sel instanceof ServiceRefImpl)
- {
- return new StructuredSelection(J2EEActionAdapterFactory.getWSDLURI((ServiceRefImpl)sel));
- }
- else if (sel instanceof WSDLResourceImpl)
- {
- return new StructuredSelection(J2EEActionAdapterFactory.getWSDLURI((WSDLResourceImpl)sel));
- }
- /*
- * TODO - Remove the cases below after bug 170834 is fixed
- *
- * WSDLSelectionTransformer should not need to handle ServiceImplBean and BeanLink which
- * represent service classes. These catches are here for now since we incorrectly allow
- * the wizard to default to top-down sceanrio when launch from these objects in the JSR-109
- * branch.
- */
- else if (sel instanceof ServiceImplBean)
- {
- return new StructuredSelection(getWSDLURI((ServiceImplBean) sel));
- }
- else if (sel instanceof BeanLink)
- {
- return new StructuredSelection(getWSDLURI((BeanLink) sel));
- } else {
- String wsdlURI = AdapterUtils.getAdaptedWSDL(sel);
- if (wsdlURI != null) {
- return new StructuredSelection(wsdlURI);
- }
- }
- }
- }
- return value;
- }
-
- private String getWSDLURI(ServiceImplBean bean) {
- EObject eObject = bean.eContainer();
- if (eObject == null)
- return "";
-
- eObject = eObject.eContainer();
-
- if (eObject instanceof WebServiceDescription) {
- WebServiceDescription wsd = (WebServiceDescription) eObject;
- IProject project = ProjectUtilities.getProject(wsd);
-
- // getWebContentPath returns the "WebContent" folder path for Web projects
- // for EJB projects, it returns the "ebjModule" folder path
- IPath path = J2EEUtils.getWebContentPath(project);
- path = path.append(wsd.getWsdlFile());
-
- return path.toString();
- }
- return "";
- }
-
- private String getWSDLURI(BeanLink link) {
- EObject eObject = link.eContainer();
- if (eObject instanceof ServiceImplBean)
- return getWSDLURI((ServiceImplBean) eObject);
- return "";
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWidget.java
deleted file mode 100644
index 5279a28..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWidget.java
+++ /dev/null
@@ -1,736 +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
- * -------- -------- -----------------------------------------------------------
- * 20060410 135441 joan@ca.ibm.com - Joan Haggarty
- * 20060410 136011 kathy@ca.ibm.com - Kathy Chan
- * 20060420 135912 joan@ca.ibm.com - Joan Haggarty
- * 20060504 119296 pmoogk@ca.ibm.com - Peter Moogk
- * 20060525 142281 joan@ca.ibm.com - Joan Haggarty
- * 20060607 144932 kathy@ca.ibm.com - Kathy Chan
- * 20060612 145081 pmoogk@ca.ibm.com - Peter Moogk
- * 20060719 139977 kathy@ca.ibm.com - Kathy Chan
- * 20060803 152701 cbrealey@ca.ibm.com - Chris Brealey
- * 20060803 152486 makandre@ca.ibm.com - Andrew Mak, Typing WSDL in Service definition field is very slow
- * 20060825 135570 makandre@ca.ibm.com - Andrew Mak, Service implementation URL not displayed properly on first page
- * 20060831 155883 makandre@ca.ibm.com - Andrew Mak, service impl field doesn't work after switching from BU to TD
- * 20061106 142500 david.schneider@unisys.com - David Schneider, WTP properties pages fonts don't follow Eclipse preferences
- * 20061211 161589 makandre@ca.ibm.com - Andrew Mak, NPE in service generation after opening and cancelling from browse dialog
- * 20070131 168786 makandre@ca.ibm.com - Andrew Mak, wsdl url on web service wizard page 1 is not reflected in browse dialog
- * 20070326 171071 makandre@ca.ibm.com - Andrew Mak, Create public utility method for copying WSDL files
- * 20090310 242440 yenlu@ca.ibm.com - Yen Lu, Pluggable IFile to URI Converter
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-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.core.runtime.jobs.IJobChangeEvent;
-import org.eclipse.core.runtime.jobs.IJobManager;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.core.runtime.jobs.JobChangeAdapter;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.ws.internal.common.J2EEActionAdapterFactory;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-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.widgets.WSDLSelectionTreeWidget;
-import org.eclipse.jst.ws.internal.ui.common.DialogResourceBrowser;
-import org.eclipse.jst.ws.internal.ui.common.FileExtensionFilter;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-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.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.ws.internal.converter.IIFile2UriConverter;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServiceEntity;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-import org.eclipse.wst.ws.internal.preferences.PersistentWSDLValidationContext;
-import org.eclipse.wst.ws.internal.util.UniversalPathTransformer;
-import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-import org.eclipse.wst.wsdl.validation.internal.IValidationMessage;
-
-public class WSDLSelectionWidget extends AbstractObjectSelectionWidget implements IObjectSelectionWidget, Runnable
-{
- private String pluginId_;
- private FileExtensionFilter wsFilter_;
- private WebServicesParser webServicesParser;
- private String wsdlURI_;
-
- private Composite parent_;
- private Listener statusListener_;
- private ModifyListener modifyListener_;
- private WSDLSelectionTreeWidget tree;
-
- private Timer timer_ = null;
-
- /*CONTEXT_ID PCON0001 for the WSDL Selection Page*/
- private final String INFOPOP_PCON_PAGE = "PCON0001";
-
- /*CONTEXT_ID PCON0002 for the WSDL Document text field of the WSDL Selection Page*/
- private final String INFOPOP_PCON_TEXT_WSDL = "PCON0002";
- private Text webServiceURI;
-
- /*CONTEXT_ID PCON0003 for the WSDL Resource Browse button of the WSDL Selection Page*/
- private final String INFOPOP_PCON_BUTTON_BROWSE_WSDL = "PCON0003";
- private Button wsBrowseButton_;
-
- /*CONTEXT_ID PCON0004 for the Wizard WSDL Validation table of the WSDL Selection Page*/
- private ValidationMessageViewerWidget msgViewer_;
- private ValidateWSDLJob validateWSDLJob_;
- private JobChangeAdapter jobChangeAdapter_;
-
- /*CONTEXT_ID PCON0005 for the Wizard WSDL Validation summary message of the WSDL Selection Page*/
- private Text validationSummaryText_;
- private Text validationSummaryText2_;
-
- /*CONTEXT_ID PCON0006 for the Stop Wizard WSDL Validation button of the WSDL Selection Page*/
- private Button stopValidationButton_;
- private final String INFOPOP_PCON_BUTTON_STOP_VALIDATION = "PCON0006";
-
- public WSDLSelectionWidget()
- {
- pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- wsFilter_ = new FileExtensionFilter(new String[] {"wsdl", "wsil", "html"});
- webServicesParser = WSDLParserFactory.getWSDLParser();
-
- final Runnable handleValidationMessages = new Runnable()
- {
- public void run()
- {
- msgViewer_.setInput(validateWSDLJob_.getValidationMessages());
- updateValidationSummary(validateWSDLJob_.getValidationMessageSeverity());
- setValidationInProgress(false);
- }
- };
-
- jobChangeAdapter_ = new JobChangeAdapter()
- {
- public void done(IJobChangeEvent event)
- {
- if (msgViewer_!= null && msgViewer_.getContentProvider() != null) {
- Display.getDefault().asyncExec( handleValidationMessages );
- }
- }
- };
- }
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener )
- {
- UIUtils uiUtils = new UIUtils( pluginId_ );
- parent_ = parent;
- statusListener_ = statusListener;
-
- parent.setToolTipText( ConsumptionUIMessages.TOOLTIP_PCON_PAGE );
- PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId_ + "." + INFOPOP_PCON_PAGE );
-
- Composite wsdlGroup = uiUtils.createComposite( parent, 2, 5, 0 );
-
- Label wsLabel = new Label( wsdlGroup, SWT.WRAP);
- wsLabel.setText( ConsumptionUIMessages.LABEL_WS_SELECTION);
- GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.horizontalSpan = 2;
- wsLabel.setLayoutData(gd);
- wsLabel.setToolTipText( ConsumptionUIMessages.TOOLTIP_PCON_TEXT_WS );
-
- webServiceURI = uiUtils.createText( wsdlGroup, null,
- ConsumptionUIMessages.TOOLTIP_PCON_TEXT_WS,
- INFOPOP_PCON_TEXT_WSDL, SWT.SINGLE | SWT.BORDER );
- modifyListener_ =
- new ModifyListener()
- {
- public void modifyText(ModifyEvent event)
- {
- handleWebServiceURIModifyEvent();
- }
- };
-
- webServiceURI.addModifyListener(modifyListener_);
-
-// webServiceURI.addListener( SWT.Modify, statusListener );
-
- wsBrowseButton_ = uiUtils.createPushButton( wsdlGroup, ConsumptionUIMessages.BUTTON_BROWSE,
- ConsumptionUIMessages.TOOLTIP_PCON_BUTTON_BROWSE_WS,
- INFOPOP_PCON_BUTTON_BROWSE_WSDL );
- wsBrowseButton_.addSelectionListener(
- new SelectionListener()
- {
- public void widgetDefaultSelected(SelectionEvent event)
- {
- handleWSDLButton();
- }
-
- public void widgetSelected(SelectionEvent event)
- {
- handleWSDLButton();
- }
- });
-
- tree = new WSDLSelectionTreeWidget();
- tree.addControls(parent, statusListener);
- tree.setWebServicesParser(webServicesParser);
-
- msgViewer_ = new ValidationMessageViewerWidget();
- msgViewer_.addControls(parent, statusListener);
-
- validationSummaryText_ = new Text( parent, SWT.WRAP);
- validationSummaryText_.setEditable(false);
- GridData gd1 = new GridData(SWT.FILL, SWT.FILL, false, false);
- validationSummaryText_.setLayoutData(gd1);
- validationSummaryText_.setToolTipText( ConsumptionUIMessages.TOOLTIP_VALIDATE_TEXT_MESSAGE_SUMMARY );
-
- validationSummaryText2_ = new Text( parent, SWT.WRAP);
- validationSummaryText2_.setEditable(false);
- validationSummaryText2_.setLayoutData(gd1);
-
- stopValidationButton_ = uiUtils.createPushButton(parent,
- ConsumptionUIMessages.LABEL_BUTTON_STOP_WSDL_VALIDATION,
- ConsumptionUIMessages.TOOLTIP_STOP_VALIDATION_BUTTON,
- INFOPOP_PCON_BUTTON_STOP_VALIDATION);
- setValidationInProgress(false);
-
- stopValidationButton_.addSelectionListener(
- new SelectionListener()
- {
- public void widgetDefaultSelected(SelectionEvent event)
- {
- handleStopValidationButton();
- }
-
- public void widgetSelected(SelectionEvent event)
- {
- handleStopValidationButton();
- }
- });
-
- setMessageSummary();
- Dialog.applyDialogFont(parent);
- return this;
- }
-
- private void setMessageSummary() {
- String validationMessageSummary = ConsumptionUIMessages.MESSAGE_VALIDATE_NO_WSDL;
- PersistentWSDLValidationContext wsdlValidationContext = WSPlugin.getInstance().getWSDLValidationContext();
- String validationSelection = wsdlValidationContext.getPersistentWSDLValidation();
- if (PersistentWSDLValidationContext.VALIDATE_REMOTE_WSDL.equals(validationSelection)) {
- validationMessageSummary = ConsumptionUIMessages.MESSAGE_VALIDATE_REMOTE_WSDL;
- } else if (PersistentWSDLValidationContext.VALIDATE_ALL_WSDL.equals(validationSelection)) {
- validationMessageSummary = ConsumptionUIMessages.MESSAGE_VALIDATE_ALL_WSDL;
- }
- validationSummaryText_.setText( validationMessageSummary );
- validationSummaryText2_.setText(" ");
- }
-
- private void handleWebServiceURIModifyEvent()
- {
- if (webServiceURI.getText().indexOf(':') > 0) {
- timer_ = Timer.newInstance(timer_, Display.getCurrent(), this);
- timer_.startTimer();
- }
- else
- handleWebServiceURI();
- statusListener_.handleEvent(null);
- }
-
- private void handleWebServiceURI() {
- handleWebServiceURI(webServiceURI.getText());
- }
-
- private void handleWebServiceURI(String wsURI)
- {
- if (wsURI.indexOf(':') < 0)
- {
- IFile file = uri2IFile(wsURI);
- if (file != null)
- wsURI = iFile2URI(file);
- }
- if (wsURI != null && wsURI.indexOf(':') >= 0 && webServicesParser.getWebServiceEntityByURI(wsURI) == null)
- {
- TimedWSDLSelectionConditionCommand cmd = new TimedWSDLSelectionConditionCommand();
- cmd.setWebServicesParser(webServicesParser);
- cmd.setWebServiceURI(wsURI);
- cmd.execute(null, null);
- }
- WebServiceEntity entity = webServicesParser.getWebServiceEntityByURI(wsURI);
- if (entity != null && entity.getType() == WebServiceEntity.TYPE_WSDL)
- tree.setEnabled(false);
- else
- tree.setEnabled(true);
- tree.setWebServiceURI(wsURI);
- tree.refreshTreeViewer();
- wsdlURI_ = wsURI;
- }
-
- public void run()
- {
- handleWebServiceURI();
- statusListener_.handleEvent(null);
- }
-
- private void handleWSDLButton()
- {
- DialogResourceBrowser dialog = new DialogResourceBrowser( parent_.getShell(), null, wsFilter_);
- dialog.open();
- IResource res = dialog.getFirstSelection();
- if( res != null )
- {
- wsdlURI_ = res.getFullPath().toString();
- webServiceURI.setText( wsdlURI_ );
- }
-
- statusListener_.handleEvent(null);
- }
-
- private void setValidationInProgress(boolean validating) {
- stopValidationButton_.setEnabled(validating);
- }
-
- private void handleStopValidationButton()
- {
- IJobManager jobManager = Platform.getJobManager();
- Job[] jobs = jobManager.find( ValidateWSDLJob.VALIDATE_WSDL_JOB_FAMILY );
- ValidateWSDLJob existingValidateWSDLJob = null;
-
- if( jobs.length > 0 )
- {
- for (int i=0; i<jobs.length; i++) {
- existingValidateWSDLJob = (ValidateWSDLJob)jobs[i];
-
- if (existingValidateWSDLJob.getState() != Job.NONE) {
- existingValidateWSDLJob.cancel();
- }
- }
- }
- clearValidationMessages();
- setValidationInProgress(false);
- }
-
- private void clearValidationMessages() {
- msgViewer_.clearInput();
- validationSummaryText_.setText(" " );
- validationSummaryText2_.setText(" ");
- }
-
- public IStatus getStatus()
- {
- // Timer validation
- /*
- * Commenting out because we don't want to block fast typers from hitting Next/Finish
- if (Timer.isRunning())
- return new SimpleStatus("", ConsumptionUIMessages.PAGE_MSG_LOADING_WEB_SERVICE_URI, Status.ERROR);
- */
-
- // Validate the String representation of the Web service URI
- // For example, is it pointing to an existing resource in the workspace?
- String wsPath = webServiceURI.getText();
- if( wsPath == null || wsPath.length() <= 0 ) {
- clearValidationMessages();
- return StatusUtils.errorStatus( ConsumptionUIMessages.PAGE_MSG_INVALID_WEB_SERVICE_URI );
- }
- else if( wsPath.indexOf(':') < 0 )
- {
- IResource res = ResourceUtils.findResource(wsPath);
- if( res == null ) {
- clearValidationMessages();
- return StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.PAGE_MSG_NO_SUCH_FILE, new Object[] {wsPath}) );
- }
- else if( res.getType() != IResource.FILE ) {
- clearValidationMessages();
- return StatusUtils.errorStatus( ConsumptionUIMessages.PAGE_MSG_INVALID_WEB_SERVICE_URI );
- }
- }
-
-
- // Validate the content of the Web service URI
- // For example, is selection a WSDL URI?
- if (!Timer.isRunning(timer_) && tree.isEnabled())
- {
- IStatus status = tree.getStatus();
- if (status != null)
- {
- int severity = status.getSeverity();
- if (severity == Status.ERROR || severity == Status.WARNING) {
- clearValidationMessages();
- return status;
- }
- }
- }
- else
- {
- if( wsPath.indexOf(':') < 0 )
- {
- String wsdlURI = iFile2URI((IFile)ResourceUtils.findResource(wsPath));
- if (webServicesParser.getWSDLDefinition(wsdlURI) == null) {
- clearValidationMessages();
- return StatusUtils.errorStatus(ConsumptionUIMessages.PAGE_MSG_SELECTION_MUST_BE_WSDL );
- }
- }
- }
-
-
- if (!Timer.isRunning(timer_)) {
- String wsdlURI1 = wsPath;
- boolean isRemote = true;
- if (tree.isEnabled()) { // is wsil
- wsdlURI1 = tree.getWsdlURI();
- if (wsdlURI1.startsWith("file:") || wsdlURI1.startsWith("platform:"))
- {
- isRemote = false;
- }
- } else {
- if (wsPath.indexOf(':') < 0)
- {
- isRemote = false;
- wsdlURI1 = iFile2URI((IFile)ResourceUtils.findResource(wsPath));
- }
- else if (wsPath.startsWith("file:") || wsPath.startsWith("platform:"))
- {
- isRemote = false;
- }
- }
-
- setMessageSummary();
- msgViewer_.clearInput();
- validateWSDL(wsdlURI1, isRemote);
- }
-
-
- // OK status
- return Status.OK_STATUS;
- }
-
- private void validateWSDL (String wsdlURI, boolean isRemote) {
-
- String validationSelection = WSPlugin.getInstance().getWSDLValidationContext().getPersistentWSDLValidation();;
- if ((PersistentWSDLValidationContext.VALIDATE_ALL_WSDL.equals(validationSelection)) ||
- (PersistentWSDLValidationContext.VALIDATE_REMOTE_WSDL.equals(validationSelection) && isRemote)) {
-
- IJobManager jobManager = Platform.getJobManager();
- Job[] jobs = jobManager.find( ValidateWSDLJob.VALIDATE_WSDL_JOB_FAMILY );
- ValidateWSDLJob existingValidateWSDLJob = null;
-
- boolean startWSDLValidation = true;
- validationSummaryText_.setText( ConsumptionUIMessages.MESSAGE_VALIDATE_IN_PROGRESS );
- validationSummaryText2_.setText(" ");
- if( jobs.length > 0 )
- {
- for (int i=0; i<jobs.length; i++) {
- existingValidateWSDLJob = (ValidateWSDLJob)jobs[i];
-
- if (existingValidateWSDLJob.getState() != Job.NONE) {
- // Job running or to be run
- // If the job is validating the same wsdlURI, let it finish running and ignore this one.
- // It is not for the same wsdlURI, cancel the job and schedule this one.
-
- if (!wsdlURI.equals(existingValidateWSDLJob.getWsdlURI())) {
- existingValidateWSDLJob.cancel();
- setValidationInProgress(false);
- } else {
- startWSDLValidation = false;
- }
- }
- }
- }
-
- if (startWSDLValidation) {
- startWSDLValidationJob(wsdlURI);
- }
- }
- return;
- }
-
- private void startWSDLValidationJob (String wsdlURI) {
- validateWSDLJob_ = new ValidateWSDLJob(wsdlURI);
- validateWSDLJob_.addJobChangeListener( jobChangeAdapter_ );
- validateWSDLJob_.schedule();
- setValidationInProgress(true);
- }
-
- public void updateValidationSummary(int messageSeverity)
- {
-
- switch (messageSeverity) {
- case IValidationMessage.SEV_ERROR:
- validationSummaryText_.setText(ConsumptionUIMessages.ERROR_MESSAGES_IN_VALIDATION);
- validationSummaryText2_.setText(ConsumptionUIMessages.WARNING_IF_CONTINUE);
- break;
- case IValidationMessage.SEV_WARNING:
- validationSummaryText_.setText(ConsumptionUIMessages.WARNING_MESSAGES_IN_VALIDATION);
- validationSummaryText2_.setText(ConsumptionUIMessages.WARNING_IF_CONTINUE);
- break;
- default:
- validationSummaryText_.setText(ConsumptionUIMessages.VALIDATION_COMPLETED);
- validationSummaryText2_.setText(" ");
- break;
- }
- }
-
- private IFile uri2IFile(String uri)
- {
- IResource res = ResourcesPlugin.getWorkspace().getRoot().findMember(uri);
-
- if (res instanceof IFile)
- return (IFile)res;
- else
- return null;
- }
-
- private String iFile2URI(IFile file)
- {
- String uri = null;
- IIFile2UriConverter converter = WSPlugin.getInstance().getIFile2UriConverter();
- boolean allowBaseConversionOnFailure = true;
- if (converter != null)
- {
- uri = converter.convert(file);
- if (uri == null)
- allowBaseConversionOnFailure = converter.allowBaseConversionOnFailure();
- }
- if (uri == null && allowBaseConversionOnFailure)
- {
- File f = file.getLocation().toFile();
- try
- {
- uri = f.toURL().toString();
- }
- catch (MalformedURLException murle)
- {
- uri = f.toString();
- }
- }
- return uri;
- }
-
- public void setInitialSelection(IStructuredSelection initialSelection)
- {
- if (initialSelection != null && !initialSelection.isEmpty())
- {
- Object object = initialSelection.getFirstElement();
- String wsdlURI = toWsdlURI(object);
- wsdlURI_ = wsdlURI;
-
- if (wsdlURI != null && webServiceURI != null)
- {
- handleWebServiceURI(wsdlURI);
-
- webServiceURI.removeModifyListener(modifyListener_);
- webServiceURI.setText(getObjectSelectionDisplayableString());
- webServiceURI.addModifyListener(modifyListener_);
- }
- }
- }
-
- private String toWsdlURI(Object object)
- {
- if (object instanceof ServiceImpl)
- return J2EEActionAdapterFactory.getWSDLURI((ServiceImpl)object);
- else if (object instanceof WSDLResourceImpl)
- return J2EEActionAdapterFactory.getWSDLURI((WSDLResourceImpl)object);
- else if (object instanceof ServiceRef)
- return J2EEActionAdapterFactory.getWSDLURI((ServiceRef)object);
- else if (object instanceof IFile)
- return ((IFile)object).getFullPath().toString();
- else if (object instanceof String)
- return (String)object;
- else
- return null;
- }
-
- public IStructuredSelection getObjectSelection()
- {
- StructuredSelection ss;
- if (tree != null && tree.getWsdlURI() != null)
- ss = new StructuredSelection(tree.getWsdlURI());
- else
- ss = new StructuredSelection(wsdlURI_);
- return new StructuredSelection(
- new WSDLSelectionWrapper( webServicesParser, ss));
- }
-
- public WebServicesParser getWebServicesParser()
- {
- return webServicesParser;
- }
-
- public IStatus validateSelection(IStructuredSelection objectSelection)
- {
- return Status.OK_STATUS;
- }
-
- public IProject getProject()
- {
- String wsdlURI;
-
- if (tree != null)
- wsdlURI = tree.getWsdlURI();
- else
- wsdlURI = wsdlURI_;
-
- if (wsdlURI != null)
- {
- IProject p = getProjectFromURI(wsdlURI);
- if (p!=null && p.exists())
- return p;
-
- String wsRelPath = wsdlURI_;
- IResource wsRes = ResourceUtils.findResource(wsRelPath);
- if (wsRes!=null && wsRes instanceof IFile)
- {
- IProject p2 = ((IFile)wsRes).getProject();
- return p2;
- }
-
- }
- return null;
- }
-
- public String getComponentName()
- {
-
- String wsdlURI;
- if (tree != null)
- wsdlURI = tree.getWsdlURI();
- else
- wsdlURI = wsdlURI_;
-
- if (wsdlURI != null)
- {
- String cname = getComponentNameFromURI(wsdlURI);
- if (cname!=null && cname.length()>0)
- return cname;
-
- String wsRelPath = wsdlURI_;
- IResource wsRes = ResourceUtils.findResource(wsRelPath);
- if (wsRes!=null && wsRes instanceof IFile)
- {
- IVirtualComponent comp = ResourceUtils.getComponentOf(wsRes);
- if (comp!=null)
- {
- return comp.getName();
- }
- }
-
- }
- return null;
- }
-
- private IProject getProjectFromURI(String uri)
- {
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- String wkspcRootLoc = root.getLocation().toString();
- int idx = uri.indexOf(wkspcRootLoc);
- if (idx != -1)
- {
- String relPath = uri.substring(wkspcRootLoc.length()+idx);
- IResource res = root.findMember(new Path(relPath));
- if (res instanceof IFile)
- {
- IProject p = ((IFile)res).getProject();
- return p;
- }
- }
- return null;
- }
-
- private String getComponentNameFromURI(String uri)
- {
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- String wkspcRootLoc = root.getLocation().toString();
- int idx = uri.indexOf(wkspcRootLoc);
- if (idx != -1)
- {
- String relPath = uri.substring(wkspcRootLoc.length()+idx);
- IResource res = root.findMember(new Path(relPath));
- if (res instanceof IFile)
- {
- IVirtualComponent comp = ResourceUtils.getComponentOf(res);
- if (comp!=null)
- {
- return comp.getName();
- }
- }
- }
- return null;
- }
-
- public String getObjectSelectionDisplayableString()
- {
- if (tree != null)
- {
- return UniversalPathTransformer.toPath(tree.getWsdlURI());
- }
- else
- {
- return UniversalPathTransformer.toPath(wsdlURI_);
- }
- }
-
- public Point getWidgetSize() {
- return new Point( 580, 580);
- }
-
- public boolean validate(String s) {
- String wsURI = s;
-
- if (wsURI.indexOf(':') < 0)
- {
- IFile file = uri2IFile(wsURI);
- if (file != null)
- wsURI = iFile2URI(file);
- }
- if (wsURI != null && wsURI.indexOf(':') >= 0 && webServicesParser.getWebServiceEntityByURI(wsURI) == null)
- {
- TimedWSDLSelectionConditionCommand cmd = new TimedWSDLSelectionConditionCommand();
- cmd.setWebServicesParser(webServicesParser);
- cmd.setWebServiceURI(wsURI);
- cmd.execute(null, null);
- }
-
- // prime widget based on the string
- wsdlURI_ = wsURI;
- if (tree != null)
- tree.setWebServiceURI(wsURI);
-
- WebServiceEntity entity = webServicesParser.getWebServiceEntityByURI(wsURI);
- if (entity != null && entity.getType() == WebServiceEntity.TYPE_WSDL)
- return true;
- else
- return false;
-
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWrapper.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWrapper.java
deleted file mode 100644
index 80a6c18..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWrapper.java
+++ /dev/null
@@ -1,32 +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.consumption.ui.widgets.object;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-/**
- * This class is a very simple wrapper that binds a WSDL parser with
- * a wsdlSelection object.
- */
-public class WSDLSelectionWrapper
-{
- public WebServicesParser parser;
- public IStructuredSelection wsdlSelection;
-
- public WSDLSelectionWrapper( WebServicesParser parser,
- IStructuredSelection selection )
- {
- this.parser = parser;
- this.wsdlSelection = selection;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidgetDefaultingCommand.java
deleted file mode 100644
index 358e599..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,1619 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 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
- * -------- -------- -----------------------------------------------------------
- * IBM Corporation. - initial API and implementation
- * 20070523 158230 kathy@ca.ibm.com - Kathy Chan
- * 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
- * 20080415 227152 makandre@ca.ibm.com - Andrew Mak, Need a way to specify a backup Web service runtime
- * 20080421 228054 makandre@ca.ibm.com - Andrew Mak, NPE in ClientRuntimeSelectionWidgetDefaultingCommand
- * 20080527 234226 kathy@ca.ibm.com - Kathy Chan
- * 20080731 242721 kathy@ca.ibm.com - Kathy Chan
- * 20100929 326549 mahutch@ca.ibm.com - Mark Hutchinson, Web Service Wizard Can Default to invalid project type
- * 20110118 334706 mahutch@ca.ibm.com - Mark Hutchinson, Web Service Wizard: Error: Template has not been defined
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.Vector;
-
-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.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.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.server.core.FacetUtil;
-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.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.common.ValidationUtils;
-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.wsrt.ClientRuntimeDescriptor;
-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.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionList;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IRuntimeType;
-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.parser.wsil.WebServicesParser;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntime;
-import org.eclipse.wst.ws.internal.wsrt.SimpleContext;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceClientInfo;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceState;
-
-public class ClientRuntimeSelectionWidgetDefaultingCommand extends AbstractDataModelOperation
-{
- private String DEFAULT_CLIENT_EAR_PROJECT_EXT = "EAR";
- private TypeRuntimeServer clientIds_;
- private boolean clientIdsFixed_ = false;
- private String clientRuntimeId_;
- private String clientProjectName_;
- private String clientEarProjectName_;
- protected boolean clientNeedEAR_ = true;
- private String clientComponentType_;
- private FacetMatcher clientFacetMatcher_;
-
- private IContext context_;
- private ISelection selection_;
- private IWebServiceClient webServiceClient_;
- private ResourceContext resourceContext_;
- private boolean test_;
-
- //A note on initial projects ...
- //The difference between clientInitialProject_ and initialProject_ is that
- //clientInitialProject_ comes from the ObjectSelectionOutputCommand while initialProject_
- //comes from SelectionCommand (i.e. it is the project containing the thing that was selected before
- //the wizard was launched). In the defaulting algorithm, clientInitialProject_ will
- //be given first priority. If, however, it is deemed that clientInitialProject_ is not a valid project
- //because it contains the J2EE Web service for which we are trying to create a client, initialProject_
- //will be given second priority.
- private IProject initialProject_; //This is the project containing the selection prior to the wizard being launched.
- private IProject clientInitialProject_; //This is the project containing the object selection from page 2.
- private String wsdlURI_;
- private WebServicesParser parser_;
-
- public ClientRuntimeSelectionWidgetDefaultingCommand()
- {
- super();
- }
-
- public void setClientTypeRuntimeServer( TypeRuntimeServer ids )
- {
- clientIds_ = ids;
- }
-
- public TypeRuntimeServer getClientTypeRuntimeServer()
- {
- return clientIds_;
- }
-
- public void setClientIdsFixed(boolean b)
- {
- clientIdsFixed_ = b;
- }
-
- public String getClientRuntimeId()
- {
- return clientRuntimeId_;
- }
-
- public String getClientProjectName()
- {
- return clientProjectName_;
- }
-
- public String getClientEarProjectName()
- {
- return clientEarProjectName_;
- }
-
- public void setClientEarProjectName(String name)
- {
- clientEarProjectName_ = name;
- }
-
- public String getClientComponentType()
- {
- return clientComponentType_;
- }
-
- public IWebServiceClient getWebService()
- {
- return webServiceClient_;
- }
-
- public IContext getContext()
- {
- return context_;
- }
-
- public ISelection getSelection()
- {
- return selection_;
- }
-
- /**
- * Defaults the following bits of information in the following order:
- * clientRuntimeId_ : the clientRuntimeId. Must be defaulted to non-empty String.
- * clientIds_.runtimeId_: the Web service runtime id. Must be defaulted to non-empty String.
- * clientProjectName_ : the name of the client project. Must be non-empty. May or may not exist.
- * clientComponentType_: the id of the client project template. Must be empty if the client
- * project exists. Must be non-empty of the client project does not exist.
- * clientIds_.serverId_: the server type id. May be an empty String if the defaulted Web service runtime
- * does not require a server.
- * clientIds_.serverInstanceId_: the server id. May be null or an empty String.
- * clientNeedEAR_: true if an EAR is needed. False otherwise.
- * clientEarProjectName_: the client EAR project. Must be empty if the clientNeedEAR_ is false.
- * Must be non-empty if the clientNeedEAR_ is true.
- * webServiceClient_ : the IWebServiceClient based on the calculated defaults. Must be non-null for "Next"
- * button to be enabled on the page following this command.
- * context_ : an IContext. Must be non-null for "Next" button to be enabled on the page following this command.
- */
- public IStatus execute(IProgressMonitor monitor, IAdaptable adaptable)
- {
-
- IEnvironment env = getEnvironment();
-
- try
- {
-
- //**Step 1** Default the Web service runtime.
-
- //clientIdsFixed_ is set to true for the Ant scenario. It's always false for the wizard
- //scenarios.
- if (clientIdsFixed_ && (clientProjectName_ == null))
- {
- // Set the clientRuntime based on the runtime, server, and initial
- // selection.
- DefaultRuntimeTriplet drt = getDefaultClientRuntimeForFixedRuntimeAndServer(clientInitialProject_, clientIds_.getServerId());
- clientFacetMatcher_ = drt.getFacetMatcher();
- clientProjectName_ = drt.getProjectName();
- clientRuntimeId_ = drt.getRuntimeId();
- }
- else
- {
- ValidationUtils vu = new ValidationUtils();
-
- // Set the runtime based on the project containing the object selection/initial selection.
- DefaultRuntimeTriplet drt = null;
-
- if (!vu.isProjectServiceProject(clientInitialProject_, wsdlURI_, parser_) && !clientIdsFixed_)
- {
- //If clientIntialProject_ does not contain the J2EE Web service, choose a clientRuntime based on it.
- drt = getDefaultRuntime(clientInitialProject_, clientIds_.getTypeId(), true, clientIds_.getServerId());
- clientFacetMatcher_ = drt.getFacetMatcher();
- clientProjectName_ = drt.getProjectName();
- clientRuntimeId_ = drt.getRuntimeId();
- }
- else
- {
- //clientInitialProject_ contains the J2EE Web service so don't use it.
- //Try using the initalProject_ instead.
- if (!vu.isProjectServiceProject(initialProject_, wsdlURI_, parser_) && !clientIdsFixed_)
- {
- //If intialProject_ does not contain the J2EE Web service, choose a clientRuntime based on it.
- drt = getDefaultRuntime(initialProject_, clientIds_.getTypeId(), true, clientIds_.getServerId());
- clientFacetMatcher_ = drt.getFacetMatcher();
- clientProjectName_ = drt.getProjectName();
- clientRuntimeId_ = drt.getRuntimeId();
- }
- else
- {
- //Both clientIntialProject_ and initialProject_ contain the J2EE Web service
- //and cannot be used to influence clientRuntime defaulting.
- //Choose a clientRuntime but don't choose clientInitialProject_
- //as the clientProject.
- drt = getDefaultRuntime(null, clientIds_.getTypeId(), true, clientIds_.getServerId());
- clientRuntimeId_ = drt.getRuntimeId();
- }
- }
-
- //Set the Web service runtime id from the clientRuntime
- clientIds_.setRuntimeId(WebServiceRuntimeExtensionUtils2.getClientRuntimeDescriptorById(clientRuntimeId_).getRuntime()
- .getId());
- }
-
- //**Step 2** Default the client project if it was not already defaulted
- //as part of defaulting the Web service runtime.
- if (clientProjectName_ == null)
- {
- // Project name did not get set when the runtime was set, so set it now
- clientProjectName_ = getDefaultClientProjectName();
- }
-
- //**Step 3** Default the client project type.
- IProject clientProject = ProjectUtilities.getProject(clientProjectName_);
- if (!clientProject.exists())
- {
- // Set the project template
- clientComponentType_ = getDefaultClientProjectTemplate();
- }
- else
- {
- //Set it to an empty String
- clientComponentType_ = "";
- }
-
-
- //**Step 4** Default the client server if this is not an Ant scenario.
- if (!clientIdsFixed_)
- {
- IStatus serverStatus = setClientDefaultServer();
- if (serverStatus.getSeverity() == Status.ERROR)
- {
- env.getStatusHandler().reportError(serverStatus);
- return serverStatus;
- }
- }
-
- //**Step 5** Default clientNeedEAR and client EAR if an EAR is needed
- setDefaultClientEarProject();
-
-
- //**Step 6** Calculate default IWebServiceClient. This is need to make sure that
- // Next is enabled on the page following this command.
- setDefaultsForExtension(env);
-
- 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 void setDefaultClientEarProject()
- {
- //Don't need an ear if this is a Java project, or if the selected template is jst.utility
- IProject clientProject = ProjectUtilities.getProject(clientProjectName_);
- if (clientProject.exists())
- {
- clientNeedEAR_ = !(FacetUtils.isJavaProject(clientProject));
- }
- else
- {
- clientNeedEAR_ = !(FacetUtils.isUtilityTemplate(clientComponentType_));
- }
-
- //If clientNeedEAR_ is still true, it means that we're not dealing with a Java project
- //or Java project type. Check the server.
- if (clientNeedEAR_)
- {
- // Determine if an ear selection is needed based on the server type.
-
- String serverId = clientIds_.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
- clientNeedEAR_ = false;
- }
- }
- } else { // serverId == null, assume that it does not need EAR
- clientNeedEAR_ = false;
-
- }
- }
-
- if (clientNeedEAR_)
- {
- clientEarProjectName_ = DefaultingUtils.getDefaultEARProjectName(clientProjectName_);
- }
- else
- {
- clientEarProjectName_ = "";
- }
- }
-
- private IStatus setClientDefaultServer()
- {
- //Choose an existing server the module is already associated with if possible
- IProject clientProject = ProjectUtilities.getProject(clientProjectName_);
- IServer[] configuredServers = ServerUtil.getServersByModule(ServerUtils.getModule(clientProject), null);
-
- if (configuredServers!=null && configuredServers.length>0 && configuredServers[0].getServerType() != null)
- {
- clientIds_.setServerId(configuredServers[0].getServerType().getId());
- clientIds_.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 (clientProject.exists())
- {
- IServer server = getServerFromProject(clientProjectName_, clientFacetMatcher_);
- if (server != null && server.getServerType() != null)
- {
- clientIds_.setServerId(server.getServerType().getId());
- clientIds_.setServerInstanceId(server.getId());
- return Status.OK_STATUS;
- }
- else
- {
- IServerType serverType = getServerTypeFromProject(clientProjectName_, clientFacetMatcher_);
- if (serverType != null)
- {
- clientIds_.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 clientRuntimeId.
- IServer server = getServerFromClientRuntimeId();
- if (server!=null && server.getServerType() != null)
- {
- clientIds_.setServerId(server.getServerType().getId());
- clientIds_.setServerInstanceId(server.getId());
- return Status.OK_STATUS;
- }
-
- IServerType serverType = getServerTypeFromClientRuntimeId();
- if (serverType != null)
- {
- clientIds_.setServerId(serverType.getId());
- return Status.OK_STATUS;
- }
-
- // No suitable server was found. Popup an error if the default Web service
- // runtime requires a server.
- RuntimeDescriptor runtimeDescriptor = WebServiceRuntimeExtensionUtils2.getRuntimeById(clientIds_.getRuntimeId());
- if (runtimeDescriptor.getServerRequired())
- {
- String runtimeLabel = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(clientIds_.getRuntimeId());
- IStatus status = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_ERROR_NO_SERVER_RUNTIME, new String[] {
- runtimeLabel}));
- return status;
- }
-
- return Status.OK_STATUS;
- }
-
- private IServer getServerFromClientRuntimeId()
- {
- 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.doesClientRuntimeSupportServer(clientRuntimeId_, 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.doesClientRuntimeSupportServer(clientRuntimeId_, serverFactoryId))
- {
- return servers[i];
- }
- }
- }
- }
- return null;
- }
-
- private IServerType getServerTypeFromClientRuntimeId()
- {
- String[] serverTypes = WebServiceRuntimeExtensionUtils2.getServerFactoryIdsByClientRuntime(clientRuntimeId_);
- 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;
- }
-
- protected IServer getServerFromProject(String projectName, FacetMatcher facetMatcher)
- {
- IServer server = null;
-
- IProject project = ProjectUtilities.getProject(projectName);
- IServer[] servers = ServerCore.getServers();
-
- if (servers.length > 0)
- {
- PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
- String preferredServerFactoryId = context.getServerFactoryId();
-
- // Get the runtime.
- org.eclipse.wst.common.project.facet.core.runtime.IRuntime fRuntime = null;
- IFacetedProject fProject = null;
-
- if (project != null && project.exists())
- {
- try
- {
- fProject = ProjectFacetsManager.create(project);
- if (fProject != null)
- {
- fRuntime = fProject.getPrimaryRuntime();
- }
- } catch (CoreException ce)
- {
-
- }
- }
-
- if (fRuntime != null)
- {
- // Get an existing server that has the same runtime.
- IServer firstMatchingServer = null;
- IRuntime sRuntime = FacetUtil.getRuntime(fRuntime);
- for (int i = 0; i < servers.length; i++)
- {
- IServer thisServer = servers[i];
- IRuntime thisServerRuntime = thisServer.getRuntime();
- if ( thisServerRuntime != null && sRuntime != null && thisServerRuntime.getId().equals(sRuntime.getId()))
- {
- if (firstMatchingServer==null)
- {
- firstMatchingServer = thisServer;
- }
-
- if (thisServer != null && thisServer.getServerType() != null && thisServer.getServerType().getId().equals(preferredServerFactoryId))
- {
-
- server = thisServer;
- break;
- }
- }
- }
-
- //If a server of the preferred server type was not found but
- //there was a server that matched, return that one.
- if (server == null && firstMatchingServer != null)
- {
- server = firstMatchingServer;
- }
- }
-
- // If an existing server could not be chosen on the basis of the project's
- // runtime,
- // try to find an existing server using the project's facets and the
- // facetsToAdd.
- if (server == null)
- {
- if (project!=null && project.exists())
- {
- Set facets = FacetUtils.getFacetsForProject(project.getName());
- if (facets != null)
- {
- Set facetsClone = new HashSet();
- facetsClone.addAll(facets);
- if (facetMatcher != null && facetMatcher.getFacetsToAdd() != null)
- {
- Iterator itr = facetMatcher.getFacetsToAdd().iterator();
- while (itr.hasNext())
- {
- facetsClone.add(itr.next());
- }
- }
- server = getServerFromFacets(facetsClone);
- }
- }
- }
- }
- return server;
- }
-
- protected IServer getServerFromFacets(Set facets)
- {
- IServer server = null;
- Set runtimes = FacetUtils.getRuntimes(new Set[]{facets});
- Iterator itr = runtimes.iterator();
- IServer[] servers = ServerCore.getServers();
- PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
- String preferredServerFactoryId = context.getServerFactoryId();
-
- //If one of the servers is of the preferred type, and its runtime
- //is in the set of matching runtimes, return that server.
- for (int j=0; j<servers.length; j++)
- {
- IServer thisServer = servers[j];
- if (thisServer != null && thisServer.getServerType() != null && thisServer.getRuntime() != null && thisServer.getServerType().getId().equals(preferredServerFactoryId))
- {
- IRuntime thisServerRuntime = thisServer.getRuntime();
- //Check to see if it matches any of the runtimes.
- Iterator runtimesItr = runtimes.iterator();
- while(runtimesItr.hasNext())
- {
- org.eclipse.wst.common.project.facet.core.runtime.IRuntime fRuntime = (org.eclipse.wst.common.project.facet.core.runtime.IRuntime)runtimesItr.next();
- IRuntime sRuntime = FacetUtil.getRuntime(fRuntime);
- if (sRuntime != null && thisServerRuntime.getId().equals(sRuntime.getId()))
- {
- server = thisServer;
- }
- }
- }
- }
-
- if (server == null)
- {
- outer: while (itr.hasNext())
- {
- org.eclipse.wst.common.project.facet.core.runtime.IRuntime fRuntime = (org.eclipse.wst.common.project.facet.core.runtime.IRuntime) itr
- .next();
- IRuntime sRuntime = FacetUtil.getRuntime(fRuntime);
- for (int i = 0; i < servers.length; i++)
- {
- IServer thisServer = servers[i];
- IRuntime thisServerRuntime = thisServer.getRuntime();
- if (thisServerRuntime != null && sRuntime != null && thisServerRuntime.getId().equals(sRuntime.getId()))
- {
- server = thisServer;
- break outer;
- }
- }
- }
- }
-
- return server;
-
- }
-
- protected IServerType getServerTypeFromProject(String projectName, FacetMatcher facetMatcher)
- {
- IServerType serverType = null;
- PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
- String preferredServerFactoryId = context.getServerFactoryId();
-
- IProject project = ProjectUtilities.getProject(projectName);
- IServerType[] serverTypes = ServerCore.getServerTypes();
-
- //Get the runtime.
- org.eclipse.wst.common.project.facet.core.runtime.IRuntime fRuntime = null;
- IFacetedProject fProject = null;
-
- if (project != null && project.exists())
- {
- try
- {
- fProject = ProjectFacetsManager.create(project);
- if (fProject != null)
- {
- fRuntime = fProject.getPrimaryRuntime();
- }
- } catch (CoreException ce)
- {
-
- }
- }
-
- if (fRuntime != null)
- {
- //Get a server type that has the same runtime type.
- IRuntime sRuntime = FacetUtil.getRuntime(fRuntime);
- if (sRuntime != null)
- {
- IRuntimeType sRuntimeType = sRuntime.getRuntimeType();
- IServerType firstMatchingServerType = null;
- for (int i=0; i<serverTypes.length; i++)
- {
- IServerType thisServerType = serverTypes[i];
- IRuntimeType thisServerRuntimeType = thisServerType.getRuntimeType();
- if (sRuntimeType != null && thisServerRuntimeType != null && thisServerRuntimeType.getId().equals(sRuntimeType.getId()))
- {
- if (firstMatchingServerType == null)
- {
- firstMatchingServerType = thisServerType;
- }
- if (thisServerType.getId().equals(preferredServerFactoryId))
- {
- serverType = thisServerType;
- break;
- }
- }
- }
-
- //If the preferred server type was not found but
- //there was a server type that matched, return that one.
- if (serverType == null && firstMatchingServerType != null)
- {
- serverType = firstMatchingServerType;
- }
- }
- }
-
- //If a server type could not be chosen on the basis of the project's runtime,
- //try to find a server type using the project's facets and the facetsToAdd.
- if (serverType == null)
- {
- if (project != null && project.exists())
- {
- Set facets = FacetUtils.getFacetsForProject(project.getName());
- if (facets != null)
- {
- Set facetsClone = new HashSet();
- facetsClone.addAll(facets);
- if (facetMatcher != null && facetMatcher.getFacetsToAdd() != null)
- {
- Iterator itr = facetMatcher.getFacetsToAdd().iterator();
- while (itr.hasNext())
- {
- facetsClone.add(itr.next());
- }
- }
- serverType = getServerTypeFromFacets(facetsClone);
- }
- }
- }
-
- return serverType;
-
- }
-
- protected IServerType getServerTypeFromFacets(Set facets)
- {
- IServerType serverType = null;
- Set runtimes = FacetUtils.getRuntimes(new Set[]{facets});
- Iterator itr = runtimes.iterator();
- IServerType[] serverTypes = ServerCore.getServerTypes();
- PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
- String preferredServerFactoryId = context.getServerFactoryId();
-
- //If one of the server types is of the preferred type, and its runtime
- //is in the set of matching runtimes, return that server type.
- for (int j=0; j<serverTypes.length; j++)
- {
- IServerType thisServerType = serverTypes[j];
- IRuntimeType thisServerTypeRuntimeType = thisServerType.getRuntimeType();
- if (thisServerTypeRuntimeType != null && thisServerType.getId().equals(preferredServerFactoryId))
- {
- //Check to see if it matches any of the runtimes.
- Iterator runtimesItr = runtimes.iterator();
- while(runtimesItr.hasNext())
- {
- org.eclipse.wst.common.project.facet.core.runtime.IRuntime fRuntime = (org.eclipse.wst.common.project.facet.core.runtime.IRuntime)runtimesItr.next();
- IRuntime sRuntime = FacetUtil.getRuntime(fRuntime);
- if (sRuntime != null)
- {
- IRuntimeType sRuntimeType = sRuntime.getRuntimeType();
- if (sRuntimeType != null && thisServerTypeRuntimeType.getId().equals(sRuntimeType.getId()))
- {
- serverType = thisServerType;
- }
- }
- }
- }
- }
-
-
- if (serverType == null)
- {
- outer: while (itr.hasNext())
- {
- org.eclipse.wst.common.project.facet.core.runtime.IRuntime fRuntime = (org.eclipse.wst.common.project.facet.core.runtime.IRuntime) itr
- .next();
- IRuntime sRuntime = FacetUtil.getRuntime(fRuntime);
- if (sRuntime != null)
- {
- IRuntimeType sRuntimeType = sRuntime.getRuntimeType();
- for (int i = 0; i < serverTypes.length; i++)
- {
- IServerType thisServerType = serverTypes[i];
- if (thisServerType != null)
- {
- IRuntimeType thisServerTypeRuntimeType = thisServerType.getRuntimeType();
- if (sRuntimeType != null && thisServerTypeRuntimeType != null && thisServerTypeRuntimeType.getId().equals(sRuntimeType.getId()))
- {
- serverType = thisServerType;
- break outer;
- }
- }
- }
- }
- }
- }
-
- return serverType;
-
- }
-
- protected IServer getServerFromProjectType(String templateId, FacetMatcher facetMatcher)
- {
- IServer server = null;
- Set facets = FacetUtils.getInitialFacetVersionsFromTemplate(templateId);
- if (facetMatcher.getFacetsToAdd() != null)
- {
- Iterator itr = facetMatcher.getFacetsToAdd().iterator();
- while (itr.hasNext())
- {
- facets.add(itr.next());
- }
- }
- server = getServerFromFacets(facets);
- return server;
- }
-
- protected IServerType getServerTypeFromProjectType(String templateId, FacetMatcher facetMatcher)
- {
- IServerType serverType = null;
- Set facets = FacetUtils.getInitialFacetVersionsFromTemplate(templateId);
- if (facetMatcher.getFacetsToAdd() != null)
- {
- Iterator itr = facetMatcher.getFacetsToAdd().iterator();
- while (itr.hasNext())
- {
- facets.add(itr.next());
- }
- }
- //TODO Instead of passing in a single set of facets, pass in multiple sets, if the
- //jst.java facet is one of them and the clientRuntimeId allows newer.
- serverType = getServerTypeFromFacets(facets);
- return serverType;
- }
-
- private String getDefaultClientProjectTemplate()
- {
- String[] templates = WebServiceRuntimeExtensionUtils2.getClientProjectTemplates(clientIds_.getTypeId(), clientIds_.getRuntimeId());
-
- //Walk the list of client project types in the project topology preference
- ProjectTopologyContext ptc= WebServiceConsumptionUIPlugin.getInstance().getProjectTopologyContext();
- String[] preferredTemplateIds = ptc.getClientTypes();
- 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.doesClientRuntimeSupportTemplate(clientRuntimeId_, templateId);
- if (matches)
- {
- return templates[i];
- }
- }
- }
- }
-
- //Since the preferredTemplateIds contains the union of all project types for all client 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 getDefaultClientProjectName()
- {
- ValidationUtils vu = new ValidationUtils();
- IProject[] projects = FacetUtils.getAllProjects();
- ClientRuntimeDescriptor desc = WebServiceRuntimeExtensionUtils2.getClientRuntimeDescriptorById(clientRuntimeId_);
- RequiredFacetVersion[] rfvs = desc.getRequiredFacetVersions();
-
- //Check each project and its facetRuntime for compatibility with the clientRuntime
- for (int i=0; i<projects.length; i++)
- {
- if (!vu.isProjectServiceProject(projects[i], wsdlURI_, parser_))
- {
- 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 = FacetUtils.match(rfvs, facetVersions);
- FacetMatcher fm = FacetMatchCache.getInstance().getMatchForProject(true, clientRuntimeId_, projects[i].getName());
- boolean facetRuntimeMatches = true;
- if (fRuntimeName != null)
- {
- facetRuntimeMatches = FacetUtils.isFacetRuntimeSupported(rfvs, fRuntimeName);
- }
-
- if (fm.isMatch() && facetRuntimeMatches)
- {
- clientFacetMatcher_ = fm;
- return projects[i].getName();
- }
- }
- }
- }
-
- //No project was suitable, return a new project name
- return ResourceUtils.getDefaultWebProjectName();
-
- }
-
- private DefaultRuntimeTriplet getDefaultClientRuntimeForFixedRuntimeAndServer(IProject project, String runtimePreferredServer)
- {
- String[] clientRuntimes = WebServiceRuntimeExtensionUtils2.getClientRuntimesByType(clientIds_.getTypeId(), runtimePreferredServer);
- ArrayList validClientRuntimes = new ArrayList();
- for (int i=0; i<clientRuntimes.length; i++ )
- {
- ClientRuntimeDescriptor desc = WebServiceRuntimeExtensionUtils2.getClientRuntimeDescriptorById(clientRuntimes[i]);
- if (desc.getRuntime().getId().equals(clientIds_.getRuntimeId()))
- {
- //Check if this client runtime supports the server
- if (WebServiceRuntimeExtensionUtils2.doesClientRuntimeSupportServer(desc.getId(), clientIds_.getServerId()))
- {
- validClientRuntimes.add(desc.getId());
- if (project != null && project.exists())
- {
- //RequiredFacetVersion[] rfv = desc.getRequiredFacetVersions();
- Set facetVersions = FacetUtils.getFacetsForProject(project.getName());
- if (facetVersions != null)
- {
- //FacetMatcher fm = FacetUtils.match(rfv, facetVersions);
- FacetMatcher fm = FacetMatchCache.getInstance().getMatchForProject(true, clientRuntimes[i], project.getName());
- if (fm.isMatch())
- {
- DefaultRuntimeTriplet drt = new DefaultRuntimeTriplet();
- drt.setFacetMatcher(fm);
- drt.setProjectName(project.getName());
- drt.setRuntimeId(desc.getId());
- return drt;
- }
- }
- }
-
- }
- }
-
- }
-
- if (validClientRuntimes.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[])validClientRuntimes.toArray(new String[0]))[0]);
- return drt;
- }
- else
- {
- //There are no client runtimes that match the fixed runtime and server. Fall back to original algorithm
- clientIdsFixed_ = false;
- return getDefaultRuntime(project, clientIds_.getTypeId(), true, clientIds_.getServerId());
- }
- }
-
- protected DefaultRuntimeTriplet getDefaultRuntime(IProject project, String typeId, boolean isClient, String runtimePreferredServer)
- {
- String[] runtimes = null;
- if (isClient)
- {
- runtimes = WebServiceRuntimeExtensionUtils2.getClientRuntimesByType(typeId, runtimePreferredServer);
- }
- else
- {
- runtimes = WebServiceRuntimeExtensionUtils2.getServiceRuntimesByServiceType(typeId, runtimePreferredServer);
- }
-
- //Split the array of service/client runtimes into one containing the preferred set and one containing the rest.
- PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
- String preferredRuntimeId = context.getRuntimeId();
- String fallbackRuntimeId = context.getFallbackRuntimeId();
- ArrayList preferredRuntimeIdsList = new ArrayList();
- ArrayList otherRuntimeIdsList = new ArrayList();
- for (int k=0; k<runtimes.length; k++ )
- {
- String descRuntimeId = null;
- if (isClient)
- {
- ClientRuntimeDescriptor desc = WebServiceRuntimeExtensionUtils2.getClientRuntimeDescriptorById(runtimes[k]);
- descRuntimeId = desc.getRuntime().getId();
- }
- else
- {
- ServiceRuntimeDescriptor desc = WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(runtimes[k]);
- descRuntimeId = desc.getRuntime().getId();
- }
-
- if (descRuntimeId.equals(preferredRuntimeId))
- {
- preferredRuntimeIdsList.add(runtimes[k]);
- }
- else if (descRuntimeId.equals(fallbackRuntimeId))
- {
- otherRuntimeIdsList.add(0, runtimes[k]); // add to beginning of otherRuntimeIdsList
- }
- else
- {
- otherRuntimeIdsList.add(runtimes[k]);
- }
- }
- String[] preferredRuntimeIds = (String[])preferredRuntimeIdsList.toArray(new String[0]);
- String[] otherRuntimeIds = (String[])otherRuntimeIdsList.toArray(new String[0]);
-
- Set facetVersions = null;
- org.eclipse.wst.common.project.facet.core.runtime.IRuntime fRuntime = null;
- String fRuntimeName = null;
-
- //If the initially selected project exists and facets can be inferred from it, look for
- //a service/client runtime that matches the project's facets and also, if possible, its facet runtime.
- //Preference should be given to the preferred service/client runtimes.
- if (project != null && project.exists())
- {
- facetVersions = FacetUtils.getFacetsForProject(project.getName());
- fRuntime = FacetUtils.getFacetRuntimeForProject(project.getName());
- fRuntimeName = null;
- if (fRuntime != null)
- {
- fRuntimeName = fRuntime.getName();
- }
-
- if (facetVersions != null)
- {
- //1. First check to see if one of the preferred service/client runtimes matches the existing
- //project's facets and runtime.
- for (int p = 0; p < preferredRuntimeIds.length; p++)
- {
- RequiredFacetVersion[] prfv = null;
- if (isClient)
- {
- prfv = WebServiceRuntimeExtensionUtils2.getClientRuntimeDescriptorById(preferredRuntimeIds[p]).getRequiredFacetVersions();
- }
- else
- {
- prfv = WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(preferredRuntimeIds[p]).getRequiredFacetVersions();
- }
-
- //FacetMatcher fm = FacetUtils.match(prfv, facetVersions);
- FacetMatcher fm = FacetMatchCache.getInstance().getMatchForProject(isClient, preferredRuntimeIds[p], project.getName());
- boolean facetRuntimeMatches = true;
- if (fRuntimeName != null)
- {
- facetRuntimeMatches = FacetUtils.isFacetRuntimeSupported(prfv, fRuntimeName);
- }
-
- if (fm.isMatch() && facetRuntimeMatches)
- {
- DefaultRuntimeTriplet drt = new DefaultRuntimeTriplet();
- drt.setFacetMatcher(fm);
- drt.setProjectName(project.getName());
- drt.setRuntimeId(preferredRuntimeIds[p]);
- return drt;
- }
- }
-
- //2. Second, check to see if one of the other clientRuntimes matches the existing
- //project's facets and runtime.
- for (int i=0; i<otherRuntimeIds.length; i++)
- {
- RequiredFacetVersion[] rfv = null;
- if (isClient)
- {
- rfv = WebServiceRuntimeExtensionUtils2.getClientRuntimeDescriptorById(otherRuntimeIds[i]).getRequiredFacetVersions();
- }
- else
- {
- rfv = WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(otherRuntimeIds[i]).getRequiredFacetVersions();
- }
-
- FacetMatcher fm = FacetMatchCache.getInstance().getMatchForProject(isClient, otherRuntimeIds[i], project.getName());
- boolean facetRuntimeMatches = true;
- if (fRuntimeName != null)
- {
- facetRuntimeMatches = FacetUtils.isFacetRuntimeSupported(rfv, fRuntimeName);
- }
- if (fm.isMatch() && facetRuntimeMatches)
- {
- DefaultRuntimeTriplet drt = new DefaultRuntimeTriplet();
- drt.setFacetMatcher(fm);
- drt.setProjectName(project.getName());
- drt.setRuntimeId(otherRuntimeIds[i]);
- return drt;
- }
- }
-
- //3. Third, check to see if one of the preferred clientRuntimes matches the existing
- //project's facets.
- for (int p = 0; p < preferredRuntimeIds.length; p++)
- {
- FacetMatcher fm = FacetMatchCache.getInstance().getMatchForProject(isClient, preferredRuntimeIds[p], project.getName());
- if (fm.isMatch())
- {
- DefaultRuntimeTriplet drt = new DefaultRuntimeTriplet();
- drt.setFacetMatcher(fm);
- drt.setProjectName(project.getName());
- drt.setRuntimeId(preferredRuntimeIds[p]);
- return drt;
- }
- }
-
- //4. Fourth, check to see if the one the other clientRuntimes matches the existing
- //project's facets.
- for (int i=0; i<otherRuntimeIds.length; i++)
- {
- FacetMatcher fm = FacetMatchCache.getInstance().getMatchForProject(isClient, otherRuntimeIds[i], project.getName());
- if (fm.isMatch())
- {
- DefaultRuntimeTriplet drt = new DefaultRuntimeTriplet();
- drt.setFacetMatcher(fm);
- drt.setProjectName(project.getName());
- drt.setRuntimeId(otherRuntimeIds[i]);
- return drt;
- }
- }
- }
- }
-
- //Haven't returned yet so this means that the intitially selected project cannot be used
- //to influence the selection of the service/client runtime.
-
- //Use the preferred project types to influence the selection of a runtime.
- ProjectTopologyContext ptc = WebServiceConsumptionUIPlugin.getInstance().getProjectTopologyContext();
- String[] preferredTemplateIds = null;
- if (isClient)
- {
- preferredTemplateIds = ptc.getClientTypes();
- }
- else
- {
- preferredTemplateIds = ptc.getServiceTypes();
- }
-
-
- for (int n=0; n<preferredTemplateIds.length; n++)
- {
- String preferredTemplateId = preferredTemplateIds[n];
-
- for (int m=0; m<preferredRuntimeIds.length; m++)
- {
- //If this client or service runtime supports this template, choose it and exit.
- boolean matches = false;
- if (isClient)
- {
- matches = WebServiceRuntimeExtensionUtils2.doesClientRuntimeSupportTemplate(preferredRuntimeIds[m], preferredTemplateId) &&
- WebServiceRuntimeExtensionUtils2.doesClientRuntimeSupportServer(preferredRuntimeIds[m], runtimePreferredServer);
- }
- else
- {
- matches = WebServiceRuntimeExtensionUtils2.doesServiceRuntimeSupportTemplate(preferredRuntimeIds[m], preferredTemplateId) &&
- WebServiceRuntimeExtensionUtils2.doesServiceRuntimeSupportServer(preferredRuntimeIds[m], runtimePreferredServer);
- }
-
- if (matches)
- {
- DefaultRuntimeTriplet drt = new DefaultRuntimeTriplet();
- drt.setFacetMatcher(null);
- //If the project doesn't exist, use the name of the project that was passed in.
- //If the project exists, it means that previous code in this method
- //determined it to not be a suitable project. Clear the project name.
- if (project==null || project.exists())
- {
- drt.setProjectName(null);
- }
- else
- {
- drt.setProjectName(project.getName());
- }
- drt.setRuntimeId(preferredRuntimeIds[m]);
- return drt;
- }
- }
- }
-
-
- //Still haven't returned. Return the first preferred service/client runtime id.
- if (preferredRuntimeIds.length > 0)
- {
- DefaultRuntimeTriplet drt = new DefaultRuntimeTriplet();
- drt.setFacetMatcher(null);
- //If the project doesn't exist, use the name of the project that was passed in.
- //If the project exists, it means that previous code in this method
- //determined it to not be a suitable project. Clear the project name.
- if (project==null || project.exists())
- {
- drt.setProjectName(null);
- }
- else
- {
- drt.setProjectName(project.getName());
- }
- drt.setRuntimeId(preferredRuntimeIds[0]);
- return drt;
- }
-
- if (otherRuntimeIds.length > 0)
- {
- DefaultRuntimeTriplet drt = new DefaultRuntimeTriplet();
- drt.setFacetMatcher(null);
- //If the project doesn't exist, use the name of the project that was passed in.
- //If the project exists, it means that previous code in this method
- //determined it to not be a suitable project. Clear the project name.
- if (project==null || project.exists())
- {
- drt.setProjectName(null);
- }
- else
- {
- drt.setProjectName(project.getName());
- }
- drt.setRuntimeId(otherRuntimeIds[0]);
- return drt;
- }
- else
- {
- DefaultRuntimeTriplet drt = new DefaultRuntimeTriplet();
- drt.setFacetMatcher(null);
- //If the project doesn't exist, use the name of the project that was passed in.
- //If the project exists, it means that previous code in this method
- //determined it to not be a suitable project. Clear the project name.
- if (project==null || project.exists())
- {
- drt.setProjectName(null);
- }
- else
- {
- drt.setProjectName(project.getName());
- }
- drt.setRuntimeId(null);
- return drt;
- }
- }
- /**
- *
- * @param project
- * @return
- */
- protected SelectionListChoices getProjectEARChoice(IProject project)
- {
- String[] flexProjects = getAllFlexibleProjects();
- SelectionList list = new SelectionList(flexProjects, 0);
- return new SelectionListChoices(list, null);
- }
-
- protected SelectionList getEARProjects()
- {
- String[] flexProjects = getAllFlexibleProjects();
- return new SelectionList(flexProjects, 0);
- }
-
- protected IResource getResourceFromInitialSelection(IStructuredSelection selection)
- {
- if (selection != null && selection.size() == 1)
- {
- Object obj = selection.getFirstElement();
- if (obj != null)
- {
- try
- {
- IResource resource = ResourceUtils.getResourceFromSelection(obj);
- return resource;
- } catch(CoreException e)
- {
- return null;
- }
- }
- }
- return null;
- }
-
-
-
- /*
- * Set defaults for the client-side from the service-side if possible.
- * Sets clientProjectName_ to a value based on the service project name.
- *
- * Returns an IStatus.OK if the service side values for server and Web
- * service runtime can be used to set the values for clientRuntimeId_,
- * clientComponentType_, all the values in clientIds_, and clientEarProjectName_.
- *
- * Returns an IStatus.ERROR otherwise, leaving only the clientProjectName_ set.
- */
- protected IStatus defaultClientSideFromServiceSide(String serviceProjectName, TypeRuntimeServer serviceIds, boolean serviceNeedEAR, String serviceEarProjectName)
- {
- //1. Start with setting the default client project name based on the service project name.
- boolean isEJB = false;
- String implId = WebServiceRuntimeExtensionUtils2.getWebServiceImplIdFromTypeId(serviceIds.getTypeId());
- isEJB = (implId.equals("org.eclipse.jst.ws.wsImpl.ejb"));
- String[] updatedNames = ResourceUtils.getClientProjectComponentName(serviceProjectName, serviceProjectName, isEJB);
- clientProjectName_ = updatedNames[0];
-
- //2. Ideally, the server and runtime on the client-side will be defaulted
- // to the same values as the service side. If a client runtime id that
- // supports clientProjectName_ and the service-side server and runtime defaults
- // can be found, choose it.
- IProject clientProject = ProjectUtilities.getProject(clientProjectName_);
- TypeRuntimeServer testIds = new TypeRuntimeServer();
- testIds.setTypeId(clientIds_.getTypeId());
- testIds.setRuntimeId(serviceIds.getRuntimeId());
- testIds.setServerId(serviceIds.getServerId());
- testIds.setServerInstanceId(serviceIds.getServerInstanceId());
-
- if (clientProject.exists())
- {
- clientComponentType_ = "";
- clientRuntimeId_ = WebServiceRuntimeExtensionUtils2.getClientRuntimeId(testIds, clientProjectName_, clientComponentType_);
- if (clientRuntimeId_ != null && clientRuntimeId_.length()>0)
- {
- clientIds_.setRuntimeId(serviceIds.getRuntimeId());
- clientIds_.setServerId(serviceIds.getServerId());
- clientIds_.setServerInstanceId(serviceIds.getServerInstanceId());
- }
- }
- else
- {
- //See if there is a client project type that supports the service-side
- //server and runtime defaults. Pick a client project type based on project topology preferences.
- //Choose the clientRuntimeId_ accordingly.
- String[] templateIds = WebServiceRuntimeExtensionUtils2.getClientProjectTemplates(clientIds_.getTypeId(), testIds.getRuntimeId());
- if (templateIds != null && templateIds.length > 0)
- {
- ProjectTopologyContext ptc = WebServiceConsumptionUIPlugin.getInstance().getProjectTopologyContext();
- String[] preferredTemplateIds = ptc.getClientTypes();
- outer: for (int j = 0; j < preferredTemplateIds.length; j++)
- {
- for (int i = 0; i < templateIds.length; i++)
- {
- String templateId = templateIds[i];
- if (templateId.equals(preferredTemplateIds[j]))
- {
- // Get a clientRuntimeId for this template
- String newClientRuntimeId = WebServiceRuntimeExtensionUtils2.getClientRuntimeId(testIds, clientProjectName_,
- templateId);
- if (newClientRuntimeId.length() > 0)
- {
- clientRuntimeId_ = newClientRuntimeId;
- clientComponentType_ = templateId;
- clientIds_.setRuntimeId(serviceIds.getRuntimeId());
- clientIds_.setServerId(serviceIds.getServerId());
- clientIds_.setServerInstanceId(serviceIds.getServerInstanceId());
- break outer;
- }
- }
- }
- }
- }
- }
-
- //3. If step 2 was successful, clientRuntimeId_ should now be set, along with clientProjectName_,
- // clientComponentType_, and all the values in clientIds_. All that remains is setting the EAR.
- if (clientRuntimeId_ != null && clientRuntimeId_.length()>0)
- {
- setDefaultClientEarProject();
- //Update the client side EAR from the service side EAR if necessary.
- if (serviceNeedEAR)
- {
- defaultClientEarFromServiceEar(serviceProjectName, serviceEarProjectName);
- }
- return Status.OK_STATUS;
- }
- else
- {
- //Step 2 was not successful. Client side defaulting cannot be done using the service side server
- //and web service runtime defaults. Return an error status.
- return StatusUtils.errorStatus("");
- }
- }
-
- protected void defaultClientEarFromServiceEar(String serviceProjectName, String serviceEarProjectName)
- {
- //Client side
- if (clientNeedEAR_)
- {
- IProject clientProject = ProjectUtilities.getProject(clientProjectName_);
- if(clientProject==null || !clientProject.exists()
- || !(clientEarProjectName_.equalsIgnoreCase(serviceEarProjectName)))
- {
- ProjectTopologyContext ptc= WebServiceConsumptionUIPlugin.getInstance().getProjectTopologyContext();
- if (!ptc.isUseTwoEARs())
- {
- clientEarProjectName_ = serviceEarProjectName;
- }
- else
- {
- IProject proxyEARProject = getUniqueClientEAR(clientEarProjectName_, serviceEarProjectName, clientProjectName_, serviceProjectName);
- clientEarProjectName_ = proxyEARProject.getName();
- }
- }
- }
-
- }
-
- private IProject getUniqueClientEAR(String earProjectName, String serviceEARProject, String clientProjectName, String serviceProjectName) {
-
- String projectName = new String();
- //If the client project doesn't exist and the service project does, ensure the
- //the client side EAR's J2EE level is such that the service project could be added to it.
- //This will ensure we don't default the page with a client project EAR at a lower
- //J2EE level than the service side.
- boolean goodJ2EELevel = true;
- if (!earProjectName.equalsIgnoreCase(serviceEARProject))
- {
- IProject clientProject = ProjectUtilities.getProject(clientProjectName);
- IProject serviceProject = ProjectUtilities.getProject(serviceProjectName);
- IProject earProject = ProjectUtilities.getProject(earProjectName);
- if (!clientProject.exists() && serviceProject.exists())
- {
- boolean canAssociate = J2EEUtils.canAssociateProjectToEARWithoutWarning(serviceProject, earProject);
- goodJ2EELevel = (canAssociate);
- }
- }
-
- if (!earProjectName.equalsIgnoreCase(serviceEARProject) && goodJ2EELevel) {
- projectName = earProjectName;
- }
- else {
- projectName = clientProjectName+DEFAULT_CLIENT_EAR_PROJECT_EXT;
- int i=1;
- while (projectName.equalsIgnoreCase(serviceEARProject)) {
- projectName = projectName+i;
- i++;
- }
- }
- return projectName.equals("") ? null : ResourceUtils.getWorkspaceRoot().getProject(projectName);
-
- }
-
- private void setDefaultsForExtension(IEnvironment env)
- {
- IWebServiceRuntime wsrt = WebServiceRuntimeExtensionUtils2.getClientRuntime(clientRuntimeId_);
- if (wsrt != null)
- {
- WebServiceClientInfo wsInfo = new WebServiceClientInfo();
- wsInfo.setServerFactoryId(clientIds_.getServerId());
- wsInfo.setServerInstanceId(clientIds_.getServerInstanceId());
- wsInfo.setState(WebServiceState.UNKNOWN_LITERAL);
- wsInfo.setWebServiceRuntimeId(clientIds_.getRuntimeId());
- wsInfo.setWsdlURL(wsdlURI_);
-
- webServiceClient_ = wsrt.getWebServiceClient(wsInfo);
- WebServiceScenario scenario = WebServiceScenario.CLIENT_LITERAL;
- if (resourceContext_ != null)
- {
- context_ = new SimpleContext(true, true, true, true, true, true, test_, false, scenario, resourceContext_.isOverwriteFilesEnabled(), resourceContext_
- .isCreateFoldersEnabled(), resourceContext_.isCheckoutFilesEnabled());
- }
- }
-
- }
-
- public void setClientInitialSelection(IStructuredSelection selection)
- {
- if (clientInitialProject_ == null)
- {
- clientInitialProject_ = getProjectFromInitialSelection(selection);
- }
- }
-
- // This is for the Ant scenario where the client project name can be set in the property file.
- // If the user has set the ClientProjectName use it for defaulting purposes
- public void setClientProjectName(String name)
- {
- clientProjectName_ = name;
- }
-
- public void setClientInitialProject(IProject clientInitialProject)
- {
- clientInitialProject_ = clientInitialProject;
- }
-
- /**
- * @param initialInitialSelection_ The initialInitialSelection_ to set.
- */
- public void setInitialInitialSelection(IStructuredSelection initialInitialSelection)
- {
- initialProject_ = getProjectFromInitialSelection(initialInitialSelection);
- }
-
- public boolean getClientNeedEAR()
- {
- return clientNeedEAR_;
- }
-
- /**
- * @param parser_ The parser_ to set.
- */
- public void setWebServicesParser(WebServicesParser parser) {
- parser_ = parser;
- }
-
- public void setWsdlURI(String wsdlURI)
- {
- wsdlURI_ = wsdlURI;
- }
-
- public void setTestService(boolean testService)
- {
- test_ = testService;
- }
-
- public void setResourceContext( ResourceContext resourceContext )
- {
- resourceContext_ = resourceContext;
- }
-
- private IProject getProjectFromInitialSelection(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;
- }
-
- protected String[] getAllFlexibleProjects()
- {
- Vector v = new Vector();
- IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
- for (int i = 0; i < projects.length; i++)
- {
- if (!projects[i].getName().equals("Servers") && !projects[i].getName().startsWith("."))
- {
- v.add(projects[i].getName());
- }
- }
-
- return (String[])v.toArray(new String[0]);
-
- }
-
- protected class FacetRuntimeMatcher
- {
- FacetMatcher facetMatcher;
- boolean runtimeMatches;
-
- public FacetMatcher getFacetMatcher()
- {
- return facetMatcher;
- }
- public void setFacetMatcher(FacetMatcher facetMatcher)
- {
- this.facetMatcher = facetMatcher;
- }
- public boolean isRuntimeMatches()
- {
- return runtimeMatches;
- }
- public void setRuntimeMatches(boolean runtimeMatches)
- {
- this.runtimeMatches = runtimeMatches;
- }
- }
-
- protected class DefaultRuntimeTriplet
- {
- FacetMatcher facetMatcher_;
- String projectName_;
- String runtimeId_;
-
-
- public DefaultRuntimeTriplet()
- {
- }
-
- public FacetMatcher getFacetMatcher()
- {
- return facetMatcher_;
- }
- public void setFacetMatcher(FacetMatcher facetMatcher_)
- {
- this.facetMatcher_ = facetMatcher_;
- }
- public String getProjectName()
- {
- return projectName_;
- }
- public void setProjectName(String projectName_)
- {
- this.projectName_ = projectName_;
- }
- public String getRuntimeId()
- {
- return runtimeId_;
- }
- public void setRuntimeId(String runtimeId_)
- {
- this.runtimeId_ = runtimeId_;
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ProjectSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ProjectSelectionWidget.java
deleted file mode 100644
index 8614d80..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ProjectSelectionWidget.java
+++ /dev/null
@@ -1,624 +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 124143 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060221 122661 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060223 129020 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060227 124392 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060413 135581 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060427 138058 joan@ca.ibm.com - Joan Haggarty
- * 20060510 140868 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060524 141024 joan@ca.ibm.com - Joan Haggarty
- * 20060829 145449 makandre@ca.ibm.com - Andrew Mak, Web service client project type dropdown disabled after selecting client project
- * 20060829 180833 ericdp@ca.ibm.com - Eric D. Peters, New Web Service wizard service settings dialog has unlabelled enabled text fields
- * 20080409 226047 kathy@ca.ibm.com - Kathy Chan
- * 20080428 224726 pmoogk@ca.ibm.com - Peter Moogk
- * 20081001 243869 ericdp@ca.ibm.com - Eric D. Peters, Web Service tools allowing mixed J2EE levels
- * 20090302 249602 ericdp@ca.ibm.com - Eric D. Peters, PII- association warning message needs update
- * 20090910 289113 ericdp@ca.ibm.com - Eric D. Peters - Linux: usability issue when selecting a Java Project in the Specify Client Project Settings dialog
- * 20100929 326549 mahutch@ca.ibm.com - Mark Hutchinson, Web Service Wizard Can Default to invalid project type
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.model.internal.validation.EARValidationMessageResourceHandler;
-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.common.FacetUtils;
-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.ProjectTopologyContext;
-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.common.UIUtils;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-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;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class ProjectSelectionWidget extends SimpleWidgetDataContributor {
-
-
-
- private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-
- //private SelectionListChoices projects_;
-
- private boolean needEAR_;
-
- private TypeRuntimeServer trsIds_;
-
- private Listener statusListener_;
-
- private Text messageText_;
-
- private boolean isClient_ = false;
-
- private byte CREATE_PROJECT = (byte) 1;
-
- private byte CREATE_EAR = (byte) 2;
-
- private byte ADD_EAR_ASSOCIATION = (byte) 4;
-
- private Composite parent_;
- private Combo moduleProject_;
- private Combo earProject_;
- private Combo projectType_;
-
- private String[] templates_;
-
- //private String componentType_;
-
- private ModifyListener projectTypeListener_;
- private ModifyListener moduleProjectListener_;
- private ModifyListener earProjectListener_;
-
- /*
- * CONTEXT_ID PWRS0016 for the service-side Web project combo box of the
- * runtime selection Page
- */
- private String INFOPOP_PWRS_COMBO_PROJECT = "PWRS0016";
-
- //private Combo module_;
-
- /* CONTEXT_ID PWRS0018 for the client project type combo box of the runtime selection Page */
- private String INFOPOP_PWRS_COMBO_CLIENT_PROJECT_TYPE = "PWRS0018";
-
- /* CONTEXT_ID PWRS0020 for the service project type combo box of the runtime selection Page */
- private String INFOPOP_PWRS_COMBO_SERVICE_PROJECT_TYPE = "PWRS0020";
-
- //private Combo earModule_;
-
- /*
- * Default Constructor
- */
- public ProjectSelectionWidget() {
- }
-
- /*
- * ProjectSelectionWidget @param isClient
- */
- public ProjectSelectionWidget(boolean isClient) {
- this.isClient_ = isClient;
- }
-
- public WidgetDataEvents addControls(Composite parent, Listener statusListener) {
-
- parent_ = parent;
- UIUtils uiUtils = new UIUtils(pluginId_);
-
- statusListener_ = statusListener;
-
- if (isClient_)
- {
- moduleProject_ = uiUtils.createCombo(parent, ConsumptionUIMessages.LABEL_CLIENT_PROJECT, ConsumptionUIMessages.LABEL_CLIENT_PROJECT, INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER );
- projectType_ = uiUtils.createCombo(parent, ConsumptionUIMessages.LABEL_CLIENT_TYPE, ConsumptionUIMessages.TOOLTIP_PWCR_COMBO_CLIENT_TYPE, INFOPOP_PWRS_COMBO_CLIENT_PROJECT_TYPE, SWT.SINGLE | SWT.BORDER |SWT.READ_ONLY);
- earProject_ = uiUtils.createCombo(parent, ConsumptionUIMessages.LABEL_CLIENT_EAR_PROJECT, ConsumptionUIMessages.LABEL_CLIENT_EAR_PROJECT, INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER );
- }
- else
- {
- moduleProject_ = uiUtils.createCombo(parent, ConsumptionUIMessages.LABEL_SERVICE_PROJECT, ConsumptionUIMessages.LABEL_SERVICE_PROJECT, INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER );
- projectType_ = uiUtils.createCombo(parent, ConsumptionUIMessages.LABEL_SERVICE_TYPE, ConsumptionUIMessages.TOOLTIP_PWCR_COMBO_SERVICE_TYPE, INFOPOP_PWRS_COMBO_SERVICE_PROJECT_TYPE, SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY);
- earProject_ = uiUtils.createCombo(parent, ConsumptionUIMessages.LABEL_SERVICE_EAR_PROJECT, ConsumptionUIMessages.LABEL_SERVICE_EAR_PROJECT, INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER );
- }
-
- //Temporarily remove the listeners
-
- projectTypeListener_ = new ModifyListener()
- {
- public void modifyText(ModifyEvent evt)
- {
- handleProjectTypeChanged();
- statusListener_.handleEvent( null );
- }
- };
-
- moduleProjectListener_ = new ModifyListener()
- {
- public void modifyText(ModifyEvent evt)
- {
- handleProjectChanged();
- updateEARState();
- statusListener_.handleEvent( null );
- }
- };
-
- earProjectListener_ = new ModifyListener()
- {
- public void modifyText(ModifyEvent evt)
- {
- statusListener_.handleEvent( null );
- }
- };
-
- // message area
- messageText_ = uiUtils.createText(parent, ConsumptionUIMessages.LABEL_NO_LABEL, ConsumptionUIMessages.LABEL_NO_LABEL, null, SWT.WRAP | SWT.MULTI | SWT.READ_ONLY);
- messageText_.setBackground(parent.getBackground());
- setEarProjectItems();
-
- return this;
- }
-
- private void listenersOn()
- {
- projectType_.addModifyListener(projectTypeListener_);
- moduleProject_.addModifyListener( moduleProjectListener_ );
- earProject_.addModifyListener( earProjectListener_ );
- }
-
- private void listenersOff()
- {
- projectType_.removeModifyListener(projectTypeListener_);
- moduleProject_.removeModifyListener( moduleProjectListener_ );
- earProject_.removeModifyListener( earProjectListener_ );
- }
-
- public String getProjectName()
- {
- return moduleProject_.getText();
- }
-
- public void setProjectName( String name )
- {
- listenersOff();
- moduleProject_.setText( name );
- handleProjectChanged();
- updateEARState();
- listenersOn();
- }
-
- public String getEarProjectName()
- {
- return earProject_.getText();
- }
-
- public void setEarProjectName( String name )
- {
- listenersOff();
- earProject_.setText( name );
- listenersOn();
- }
-
- public void setComponentType( String type )
- {
- listenersOff();
- if (type != null && type.length()>0)
- {
- String label = FacetUtils.getTemplateLabelById(type);
- projectType_.setText(label);
- }
- else
- projectType_.setText("");
-
- handleProjectTypeChanged();
- listenersOn();
- }
-
- public String getComponentType()
- {
- int idx = projectType_.getSelectionIndex();
- if (templates_ != null && idx > -1)
- {
- return templates_[idx];
- }
- else
- {
- String templateLabel = projectType_.getText();
- String templateId = FacetUtils.getTemplateIdByLabel(templateLabel);
- return templateId;
- }
-
- }
-
- public boolean getNeedEAR()
- {
- return needEAR_;
- }
-
- public void setNeedEAR(boolean b)
- {
- listenersOff();
- needEAR_ = b;
- if (needEAR_)
- {
- earProject_.setEnabled(true);
- populateEARCombos();
- }
- else
- {
- earProject_.setEnabled(false);
- earProject_.setText("");
- }
- listenersOn();
- }
-
- public void setTypeRuntimeServer(TypeRuntimeServer trs)
- {
- trsIds_ = trs;
- if (earProject_ != null)
- {
- listenersOff();
- updateEARState();
- listenersOn();
- }
- }
-
- public void refreshProjectItems()
- {
- listenersOff();
- String selectedModuleProject = moduleProject_.getText();
- String runtimeId = trsIds_.getRuntimeId();
- String typeId = trsIds_.getTypeId();
-
- //Get all the projects that are compatible with the type and runtime
- String[] projectNames = null;
- if (isClient_)
- {
- projectNames = WebServiceRuntimeExtensionUtils2.getProjectsForClientTypeAndRuntime(typeId, runtimeId);
- }
- else
- {
- projectNames = WebServiceRuntimeExtensionUtils2.getProjectsForServiceTypeAndRuntime(typeId, runtimeId);
- }
-
- moduleProject_.setItems(projectNames);
- moduleProject_.setText(selectedModuleProject);
- handleProjectChanged();
- updateEARState();
- listenersOn();
- }
-
- public void setEarProjectItems()
- {
- IVirtualComponent[] ears = J2EEUtils.getAllEARComponents();
- String[] earProjectNames = new String[ears.length];
- for (int i=0; i<earProjectNames.length; i++)
- {
- earProjectNames[i]=ears[i].getProject().getName();
- }
- earProject_.setItems(earProjectNames);
-
- if (earProjectNames.length > 0)
- earProject_.select(0);
- }
-
- private void handleProjectTypeChanged()
- {
- updateEARState();
- }
-
- private void handleProjectChanged()
- {
- updateTemplates();
- }
-
- private void updateTemplates()
- {
- String projectName = moduleProject_.getText();
- if (projectName != null && projectName.length()>0)
- {
- IProject project = ProjectUtilities.getProject(projectName);
- if (project.exists())
- {
- projectType_.setEnabled(false);
- projectType_.deselectAll();
- }
- else
- {
- populateProjectTypeCombo();
- projectType_.setEnabled(true);
- }
- }
- }
-
- private void populateProjectTypeCombo()
- {
- //Get the old value if there was one.
- String oldTemplateId = getComponentType();
-
- String[] templates = null;
- if (trsIds_ != null)
- {
- if (isClient_)
- {
- templates = WebServiceRuntimeExtensionUtils2.getClientProjectTemplates(trsIds_.getTypeId(), trsIds_.getRuntimeId(), trsIds_.getServerId());
- }
- else
- {
- templates = WebServiceRuntimeExtensionUtils2.getServiceProjectTemplates(trsIds_.getTypeId(), trsIds_.getRuntimeId(), trsIds_.getServerId());
- }
-
- String[] templateLabels = FacetUtils.getTemplateLabels(templates);
- projectType_.setItems(templateLabels);
- templates_ = templates;
-
- if (templates.length > 0)
- {
-
- //Select the previous template selection if that one is in the list.
- int idx = getIndexOfTemplateId(templates, oldTemplateId);
- if (idx > -1)
- {
- projectType_.select(idx);
- }
- else
- {
- // Select the preferred client project type.
- ProjectTopologyContext ptc = WebServiceConsumptionUIPlugin.getInstance().getProjectTopologyContext();
- String[] preferredTemplateIds = null;
- if (isClient_)
- {
- preferredTemplateIds = ptc.getClientTypes();
- }
- else
- {
- preferredTemplateIds = ptc.getServiceTypes();
- }
-
- boolean selected = false;
- outer: 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]))
- {
- projectType_.select(i);
- selected = true;
- break outer;
- }
- }
- }
-
- if (!selected)
- {
- projectType_.select(0);
- }
- }
- }
- }
- }
-
-
- private int getIndexOfTemplateId(String[] templateIds, String templateId)
- {
- for (int i=0; i<templateIds.length; i++)
- {
- if (templateIds[i].equals(templateId))
- {
- return i;
- }
- }
-
- return -1;
- }
-
- private void updateEARState()
- {
- if(!projectNeedsEAR(moduleProject_.getText()))
- {
- earProject_.setEnabled(false);
- earProject_.setText("");
- needEAR_ = false;
- }
- else
- {
- needEAR_ = true;
- earProject_.setEnabled(true);
- populateEARCombos();
- }
-
- }
-
- private void populateEARCombos()
- {
- earProject_.removeAll();
- setEarProjectItems();
-
- String earName = DefaultingUtils.getDefaultEARProjectName(moduleProject_.getText());
- earProject_.setText(earName);
- }
-
- private boolean projectNeedsEAR(String projectName)
- {
- //If the project is a simple Java project or the project type is
- //Java utility return false.
- if (projectName != null && projectName.length()>0)
- {
- IProject project = ProjectUtilities.getProject(projectName);
- if (project.exists())
- {
- if (FacetUtils.isJavaProject(project))
- {
- return false;
- }
- }
- }
-
- //Project didn't rule out the need for an EAR
- //so check the proect type
- String templateId = getComponentType();
- if (templateId != null && templateId.length()>0)
- {
- if (FacetUtils.isUtilityTemplate(templateId))
- {
- return false;
- }
- }
-
-
- //Project or project type didn't rule out the need for an EAR
- //so check the server type.
- if (trsIds_ != null && trsIds_.getServerId() != null)
- {
- String targetId = ServerUtils.getRuntimeTargetIdFromFactoryId(trsIds_.getServerId());
- if (targetId!=null && targetId.length()>0)
- {
- if (!ServerUtils.isTargetValidForEAR(targetId,"13")) //rm j2ee
- {
- return false;
- }
- }
- }
-
- return true;
- }
-
-
- private IStatus handleSetMessageText() {
- IStatus status = Status.OK_STATUS;
- try {
- byte result = (byte) 0;
- if (moduleProject_.getText().length() != 0 && earProject_.getText().length() != 0) {
- String projectText = moduleProject_.getText();
- String earText = earProject_.getText();
- IProject project = ResourceUtils.getWorkspaceRoot().getProject(projectText);
- IProject ear = ResourceUtils.getWorkspaceRoot().getProject(earText);
- if (project != null) {
- if (!project.exists()) {
- result = (byte) (result | CREATE_PROJECT);
- }
- if (!ear.exists()) {
- result = (byte) (result | CREATE_EAR);
- }
-
- if (project.exists() && J2EEUtils.exists(project) && ear.exists() && J2EEUtils.exists(ear)) {
- if (!J2EEUtils.isComponentAssociated(ear, project)) result = (byte) (result | ADD_EAR_ASSOCIATION);
- }
- }
- }
- if (isClient_) {
- messageText_.setText(getValidationMessage(result, ConsumptionUIMessages.MSG_CLIENT_SUB));
- }
- else {
- messageText_.setText(getValidationMessage(result, ConsumptionUIMessages.MSG_SERVICE_SUB));
- }
- parent_.layout(); //force message area resize/wrap
- }
- catch (Exception e) {
- return StatusUtils.errorStatus( ConsumptionUIMessages.PAGE_MSG_VALIDATION_INTERNAL_ERROR, e );
- }
- return status;
- }
-
- private String getValidationMessage(byte result, String serviceOrClient) {
- String msg = null;
- switch (result) {
- case 0:
- return "";
- case 1:
- case 5:
- msg = ConsumptionUIMessages.MSG_PROJECT_WILL_BE_CREATED;
- break;
- case 2:
- case 6:
- msg = ConsumptionUIMessages.MSG_EAR_WILL_BE_CREATED;
- break;
- case 3:
- case 7:
- msg = ConsumptionUIMessages.MSG_PROJECT_AND_EAR_CREATED;
- break;
- case 4:
- msg = ConsumptionUIMessages.MSG_EAR_WILL_BE_ASSOCIATED;
- break;
- }
- return msg != null ? NLS.bind(msg, new Object[] { serviceOrClient}) : "";
- }
-
- public IStatus getStatus()
- {
- IStatus finalStatus = Status.OK_STATUS;
- handleSetMessageText();
- String projectText = moduleProject_.getText();
- String earText = earProject_.getText();
-
- if (projectText==null || projectText.length()==0)
- {
- if (isClient_)
- return StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_CLIENT_PROJECT_EMPTY, new String[]{""} ) );
- else
- return StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_SERVICE_PROJECT_EMPTY, new String[]{""} ) );
- }
-
- if (needEAR_ && (earText==null || earText.length()==0))
- {
- if (isClient_)
- {
- return StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_CLIENT_EAR_EMPTY, new String[]{""} ) );
- }
- else
- {
- return StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_SERVICE_EAR_EMPTY, new String[]{""} ) );
- }
- }
-
- //If the project and EAR both exist and the project is not already associated with the EAR, ensure
- //they can be associated.
- if (needEAR_)
- {
- IProject p = ProjectUtilities.getProject(projectText.trim());
- IProject ep = ProjectUtilities.getProject(earText.trim());
- if (p.exists() && ep.exists())
- {
- if (!J2EEUtils.isComponentAssociated(ep,p))
- {
- boolean associateStatus = J2EEUtils.canAssociateProjectToEARWithoutWarning(p, ep);
- if (!associateStatus)
- {
- if (isClient_)
- {
- return StatusUtils.warningStatus( NLS.bind(ConsumptionUIMessages.MSG_CLIENT_CANNOT_ASSOCIATE, new String[]{p.getName(), ep.getName()} ) );
- }
- else
- {
- return StatusUtils.warningStatus( NLS.bind(ConsumptionUIMessages.MSG_SERVICE_CANNOT_ASSOCIATE, new String[]{p.getName(), ep.getName()} ) );
- }
- }
- }
- }
- }
-
- return finalStatus;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestDelegateCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestDelegateCommand.java
deleted file mode 100644
index fc2ed41..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestDelegateCommand.java
+++ /dev/null
@@ -1,368 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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
- * 20060608 145529 kathy@ca.ibm.com - Kathy Chan
- * 20080325 184761 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080610 224433 makandre@ca.ibm.com - Andrew Mak, Need better error message in sample JSP generation when Java proxy bean does not exist (cont.)
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import java.util.List;
-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.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestExtension;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry;
-import org.eclipse.wst.command.internal.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.selection.BooleanSelection;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionList;
-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.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceTester;
-import org.eclipse.wst.ws.internal.wsrt.TestInfo;
-
-
-/*
-* The JSPGeneration task runs the jsp generation engine found in the
-* JBWizard Plugin
-*
-*
-*/
-public class ClientTestDelegateCommand extends AbstractDataModelOperation
-{
- private WebServiceTestRegistry testRegistry;
- private SelectionList testFacilities;
- private String jspFolder;
- private BooleanSelection[] methods;
- private String sampleServerTypeID;
- private IServer sampleExistingServer;
- private String proxyBean;
- private boolean runTestClient;
- private boolean canRunTestClient = true;
- private String sampleProject;
- private String sampleP;
- private String clientProject;
- private String clientP;
- private String clientC;
- private boolean clientNeedEAR;
- private String clientEarProjectName;
- private String clientEarComponentName;
- private TypeRuntimeServer serverIds;
- private String serviceProject;
- private String serviceP;
- private String wsdlServiceURL;
- private boolean isTestWidget = false;
- private String setEndpointMethod;
- private List endpoints;
-
- public ClientTestDelegateCommand ()
- {
- testRegistry = WebServiceTestRegistry.getInstance();
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
- IStatus status = Status.OK_STATUS;
- String clientTestID = testFacilities.getSelection();
-
- //Get the webservice extension
-
- WebServiceTestExtension wscte = (WebServiceTestExtension)testRegistry.getWebServiceExtensionsByName(clientTestID);
- TestInfo testInfo = getTestInfo();
-
- if (wscte.isCodeGenNeeded() && testInfo.getProxyBean() == null)
- return StatusUtils.errorStatus(ConsumptionUIMessages.MSG_ERROR_JTS_PROXY_NOT_COMPILED);
-
- IWebServiceTester iwst = (IWebServiceTester)wscte.getWebServiceExecutableExtension();
-
- status = commandFactoryExecution(iwst.generate(testInfo),env, monitor );
- if(status.getSeverity() == Status.ERROR){
- return status;
- }
-
- testInfo.setRunTestClient(runTestClient);
-
- if(canRunTestClient){
- status = commandFactoryExecution(iwst.launch(testInfo),env, monitor );
- if(status.getSeverity() == Status.ERROR){
- return status;
- }
- }
- return status;
- }
-
- private IStatus commandFactoryExecution(ICommandFactory commandFactory,IEnvironment env, IProgressMonitor monitor )
- {
- IStatus status = Status.OK_STATUS;
-
- while(commandFactory.hasNext())
- {
- AbstractDataModelOperation operation = commandFactory.getNextCommand();
- operation.setEnvironment( env );
-
- try
- {
- status = operation.execute( monitor, null );
- }
- catch( Exception exc )
- {
- status = StatusUtils.errorStatus( exc );
- }
-
- if(status.getSeverity() == Status.ERROR){
- IStatusHandler sHandler = env.getStatusHandler();
- sHandler.reportError(status);
- return status;
- }
- }
- return status;
- }
-
-
- //Helper method which sets up the TestInfo data structure
- private TestInfo getTestInfo()
- {
- IServer serviceExistingServer = null;
- String serviceServerTypeID = null;
-
- //service server info
- if(serverIds != null){
- if (serverIds.getServerInstanceId() != null)
- serviceExistingServer = ServerCore.findServer(serverIds.getServerInstanceId());
- }
- if (serviceExistingServer != null)
- serviceServerTypeID = serviceExistingServer.getServerType().getId();
-
-
- if(clientProject != null){
- int index = clientProject.indexOf("/");
- if (index!=-1){
- clientP = clientProject.substring(0,index);
- clientC = clientProject.substring(index + 1);
- }
- }
-
-
- if(sampleProject != null){
- int index = sampleProject.indexOf("/");
- if (index!=-1){
- sampleP = sampleProject.substring(0,index);
- }
- }
-
- TestInfo testInfo = new TestInfo();
- testInfo.setClientExistingServer(sampleExistingServer);
- testInfo.setClientServerTypeID(sampleServerTypeID);
- testInfo.setJspFolder(jspFolder);
- testInfo.setExternalBrowser(false);
- testInfo.setEndpoint(endpoints);
- testInfo.setGenerationProject(sampleP);
- testInfo.setProxyBean(proxyBean);
- testInfo.setSetEndpointMethod(setEndpointMethod);
- testInfo.setClientProject(clientP);
- testInfo.setClientModule(clientC);
- testInfo.setClientNeedEAR(clientNeedEAR);
- testInfo.setClientEARProject(clientEarProjectName);
- testInfo.setClientEARModule(clientEarComponentName);
- testInfo.setMethods(methods);
-
- //if this is a client scenario the service stuff is empty
- if(serviceServerTypeID == null){
- serviceServerTypeID = sampleServerTypeID;
- serviceExistingServer = sampleExistingServer;
- }
-
-
- testInfo.setServiceServerTypeID(serviceServerTypeID);
- testInfo.setServiceExistingServer(serviceExistingServer);
- //wsdl stuff
- testInfo.setServiceProject(getWSDLProject());
- testInfo.setWsdlServiceURL(wsdlServiceURL);
- return testInfo;
- }
-
-
-
- //The test facilities retrieved from the extension
- //plus the default
- public void setTestFacility(SelectionList selection)
- {
- testFacilities = selection;
- }
-
- public void setFolder(String folder)
- {
- }
-
- public void setJspFolder(String jspFolder)
- {
- this.jspFolder = jspFolder;
- }
-
- public void setMethods(BooleanSelection[] methods)
- {
- this.methods = methods;
- }
-
- public void setRunTestClient(boolean runTestClient)
- {
- this.runTestClient = runTestClient;
- }
-
- public void setProxyBean(String proxyBean)
- {
- this.proxyBean = proxyBean;
- }
-
- public void setSampleProject(String sampleProject)
- {
- this.sampleProject = sampleProject;
- }
-
- public void setClientProject(String clientProject)
- {
- this.clientProject = clientProject;
- }
-
- public void setScenarioContext(ScenarioContext scenarioContext)
- {
- }
-
- public void setClientTestRegistry(WebServiceTestRegistry testRegistry)
- {
- this.testRegistry = testRegistry;
- }
-
- public void setSampleServerTypeID(String sampleServerTypeID)
- {
- this.sampleServerTypeID = sampleServerTypeID;
- }
-
- public void setSampleExistingServer(IServer sampleExistingServer)
- {
- this.sampleExistingServer = sampleExistingServer;
- }
-
- public void setClientTypeRuntimeServer(TypeRuntimeServer ids)
- {
- }
-
- public void setServiceTypeRuntimeServer(TypeRuntimeServer ids)
- {
- serverIds = ids;
- }
-
- public String getSampleServerTypeID()
- {
- return sampleServerTypeID;
- }
-
- public IServer getSampleExistingServer()
- {
- return sampleExistingServer;
- }
-
- public void setClientServer(String clientServer)
- {
- }
-
- public void setServerProject(String serviceProject)
- {
- this.serviceProject = serviceProject;
- }
-
- public String getWSDLProject()
- {
- if(serviceProject != null){
- int index = serviceProject.indexOf("/");
- if (index!=-1) {
- serviceP = serviceProject.substring(0,index);
- return serviceP;
- }
- }
-
- return clientP;
- }
-
- public void setWsdlURI(String wsdlServiceURL)
- {
- this.wsdlServiceURL = wsdlServiceURL;
- }
-
- public void setGenerateProxy(boolean generateProxy)
- {
- }
-
- public boolean getIsTestWidget()
- {
- return isTestWidget;
- }
-
- public void setClientEarProjectName(String clientEarProjectName)
- {
- this.clientEarProjectName = clientEarProjectName;
- }
-
- public void setClientEarComponentName(String clientEarComponentName)
- {
- this.clientEarComponentName = clientEarComponentName;
- }
-
- public void setCanRunTestClient(boolean canRunTestClient){
- this.canRunTestClient = canRunTestClient;
- }
-
- /**
- * @param setEndpointMethod The setEndpointMethod to set.
- */
- public void setSetEndpointMethod(String setEndpointMethod)
- {
- this.setEndpointMethod = setEndpointMethod;
- }
- /**
- * @param endpoint The endpoint to set.
- */
- 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 boolean getClientNeedEAR() {
- return clientNeedEAR;
- }
-
- public void setClientNeedEAR(boolean clientNeedEAR) {
- this.clientNeedEAR = clientNeedEAR;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestFragment.java
deleted file mode 100644
index 08638af..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestFragment.java
+++ /dev/null
@@ -1,85 +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
- * -------- -------- -----------------------------------------------------------
- * 20060727 144354 kathy@ca.ibm.com - Kathy Chan
- * 20070502 180304 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-/**
- */
-package org.eclipse.jst.ws.internal.consumption.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.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-
-
-public class ClientTestFragment extends BooleanFragment
-{
- private boolean testService;
- private boolean genProxy; // This actually represent whether client test is requested
- private boolean launchedTest = false;
- private boolean canGenProxy;
-
- public ClientTestFragment( String id )
- {
- SequenceFragment clientTestRoot = new SequenceFragment();
- Condition condition = new Condition()
- {
- public boolean evaluate()
- {
- return testService && genProxy;
- }
- };
- setCondition( condition );
-
-
- Condition jspCondition = new Condition()
- {
- public boolean evaluate()
- {
- return canGenProxy;
- }
- };
-
- SimpleFragment simpleJSPFragment = new SimpleFragment( new WebServiceClientTestArrivalCommand(), "" );
- BooleanFragment choiceJSPFragment = new BooleanFragment();
- choiceJSPFragment.setTrueFragment(simpleJSPFragment);
- choiceJSPFragment.setCondition(jspCondition);
- clientTestRoot.add(choiceJSPFragment);
-
- clientTestRoot.add( new SimpleFragment( id ) );
- setTrueFragment( clientTestRoot );
-
- }
-
- public void setGenerateProxy( boolean genProxy )
- {
- this.genProxy = genProxy;
- }
-
- public void setCanGenerateProxy( boolean canGenProxy )
- {
- this.canGenProxy = canGenProxy;
- }
-
- public void setTestService( Boolean testService )
- {
- this.testService = testService.booleanValue();
- }
-
-
-
- public boolean getLaunchedTest()
- {
- return launchedTest;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestWidget.java
deleted file mode 100644
index feb0178..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestWidget.java
+++ /dev/null
@@ -1,730 +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
- * -------- -------- -----------------------------------------------------------
- * 20060524 142635 gilberta@ca.ibm.com - Gilbert Andrews
- * 20060815 104870 makandre@ca.ibm.com - Andrew Mak, enable/disable test page controls base on settings in test facility extension
- * 20060815 153903 makandre@ca.ibm.com - Andrew Mak, Browse does not work in generate client test page
- * 20080325 184761 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080425 221232 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080506 227848 makandre@ca.ibm.com - Andrew Mak, Disabled "Run on Server" checkbox is in checked state
- * 20080527 234192 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080616 237298 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080619 237797 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080723 241303 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080808 243602 rkklai@ca.ibm.com - Raymond Lai, fix NPE when changing runtime (the server combo)
- * 20090302 242462 ericdp@ca.ibm.com - Eric D. Peters, Save Web services wizard settings
- * 20090324 247535 mahutch@ca.ibm.com - Mark Hutchinson, Wrong server instance(s) is chosen during JAX-RPC sample generation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import java.util.Set;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.common.FacetUtils;
-import org.eclipse.jst.ws.internal.consumption.common.FolderResourceFilter;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.common.LabelsAndIds;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestExtension;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry;
-import org.eclipse.jst.ws.internal.ui.common.ComboWithHistory;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.jst.ws.internal.ui.dialog.DialogUtils;
-import org.eclipse.swt.SWT;
-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.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-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.core.selection.BooleanSelection;
-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.server.core.IRuntime;
-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.internal.facets.FacetUtil;
-
-
-public class ClientTestWidget extends SimpleWidgetDataContributor
-{
- private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-
- /*CONTEXT_ID PWSM0001 for the Sample Page*/
- private String INFOPOP_PWSM_PAGE = "PWSM0001";
- //
- private Button testCheckbox_;
- /*CONTEXT_ID PWSM0002 for the Test check box of the Sample Page*/
- private String INFOPOP_PWSM_CHECKBOX_TEST = "PWSM0002";
-
- private Combo testTypeCombo_;
- /*CONTEXT_ID PWSM0003 for the Test Type Combo box of the Sample Page*/
- private String INFOPOP_PWSM_COMBOBOX_TEST = "PWSM0003";
-
- private Combo runtimesCombo;
- /*CONTEXT_ID PWSM0004 for the server type combo box of the Sample Page*/
- private String INFOPOP_PWSM_COMBOBOX_SERVER = "PWSM0004";
-
- private Combo serverInstanceTypeCombo_;
- /*CONTEXT_ID PWSM0005 for the server instance combo box of the Sample Page*/
- private String INFOPOP_PWSM_COMBOBOX_SERVER_INSTANCE = "PWSM0005";
-
- private Text jspFolderText_;
- /*CONTEXT_ID PWSM0008 for the JSP Folder field of the Sample Page*/
- private String INFOPOP_PWSM_TEXT_JSP_FOLDER = "PWSM0008";
-
- private Button sampleFolderBrowseButton_;
- /*CONTEXT_ID PWSM0009 for the JSP Folder Browse button of the Sample Page*/
- private String INFOPOP_PWSM_BUTTON_JSP_FOLDER_BROWSE = "PWSM0009";
-
- private Text projectCombo_;
- /*CONTEXT_ID PWSM0010 for the Project combo box of the Sample Page*/
- private String INFOPOP_PWSM_COMBO_PROJECT = "PWSM0010";
-
- private Tree methodsTree_;
-
- private Button selectAllMethodsButton_;
- /*CONTEXT_ID PWSM0006 for the Select All button of the Sample Page*/
- private String INFOPOP_PWSM_BUTTON_SELECT_ALL = "PWSM0006";
-
- private Button deselectAllMethodsButton_;
- /*CONTEXT_ID PWSM0007 for the Deselect All button of the Sample Page*/
- private String INFOPOP_PWSM_BUTTON_DESELECT_ALL = "PWSM0007";
-
- private ComboWithHistory sampleFolderText_;
- /*CONTEXT_ID PWSM0014 for the Folder field of the Sample Page*/
- private String INFOPOP_PWSM_TEXT_SAMPLE_FOLDER = "PWSM0014";
- private ModifyListener sampleFolderTextModifyListener;
-
- //
- private Button runTestCheckbox_;
- /*CONTEXT_ID PWSM0015 for the run test check box of the Sample Page*/
- private String INFOPOP_PWSM_CHECKBOX_LAUNCH = "PWSM0015";
- //
- private Text earCombo_;
- /*CONTEXT_ID PWSM0016 for the EAR combo box of the Sample Page*/
- private String INFOPOP_PWSM_EAR_COMBO = "PWSM0016";
-
- private Composite comboGroup_;
- private SelectionList testFacilities_;
- private FolderResourceFilter folderFilter_ = new FolderResourceFilter();
- private IStructuredSelection initialSelection_;
- private boolean isTestWidget = false;
- private boolean isPopup = false;
- private boolean isWebProject = false;
-
- private LabelsAndIds runtimes_;
- private LabelsAndIds serverInstances_;
-
- private IPath webContentPath_;
- private IResource webContent_;
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener )
- {
-
-
- isTestWidget = true;
- UIUtils uiUtils = new UIUtils( pluginId_ );
-
- parent.setToolTipText( ConsumptionUIMessages.TOOLTIP_PWSM_PAGE );
- PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId_ + "." + INFOPOP_PWSM_PAGE );
-
- testCheckbox_ = uiUtils.createCheckbox( parent, ConsumptionUIMessages.BUTTON_TEST,
- ConsumptionUIMessages.TOOLTIP_PWSM_CHECKBOX_TEST,
- INFOPOP_PWSM_CHECKBOX_TEST );
- testCheckbox_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleTestButton();
- }
- });
-
- comboGroup_ = uiUtils.createComposite( parent, 3, 5, 0 );
-
- testTypeCombo_ = uiUtils.createCombo( comboGroup_, ConsumptionUIMessages.LABEL_TEST_TYPES,
- ConsumptionUIMessages.TOOLTIP_PWSM_COMBOBOX_TEST,
- INFOPOP_PWSM_COMBOBOX_TEST,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
- testTypeCombo_.addSelectionListener(
- new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- handleTestFacilitySelection();
- }
- }
- );
-
-
-
- new Label( comboGroup_, SWT.NONE );
-
- projectCombo_ = uiUtils.createText( comboGroup_, ConsumptionUIMessages.LABEL_JSP_PROJECT_NAME,
- ConsumptionUIMessages.TOOLTIP_PWSM_COMBO_PROJECT,
- INFOPOP_PWSM_COMBO_PROJECT,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-
- new Label( comboGroup_, SWT.NONE );
-
-
- earCombo_ = uiUtils.createText( comboGroup_, ConsumptionUIMessages.LABEL_EAR_PROJECTS,
- ConsumptionUIMessages.TOOLTIP_PWSM_EAR_PROJECT,
- INFOPOP_PWSM_EAR_COMBO,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-
- new Label( comboGroup_, SWT.NONE );
-
-
-
- sampleFolderText_ = uiUtils.createComboWithHistory(comboGroup_, ConsumptionUIMessages.LABEL_FOLDER_NAME,
- ConsumptionUIMessages.TOOLTIP_PWSM_TEXT_SAMPLE_FOLDER,
- INFOPOP_PWSM_TEXT_SAMPLE_FOLDER,
- SWT.SINGLE | SWT.BORDER , WebServiceConsumptionUIPlugin.getInstance().getDialogSettings());
-
-
- sampleFolderTextModifyListener = new ModifyListener()
- {
- public void modifyText(ModifyEvent evt) {
- handleFolderText();
- }
-
- };
-
- sampleFolderText_.addModifyListener(sampleFolderTextModifyListener);
-
- sampleFolderBrowseButton_ = uiUtils.createPushButton( comboGroup_, ConsumptionUIMessages.BUTTON_BROWSE,
- ConsumptionUIMessages.TOOLTIP_PWSM_BUTTON_JSP_FOLDER_BROWSE,
- INFOPOP_PWSM_BUTTON_JSP_FOLDER_BROWSE );
- sampleFolderBrowseButton_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleSampleBrowse();
- }
- });
-
- jspFolderText_ = uiUtils.createText(comboGroup_, ConsumptionUIMessages.LABEL_JSP_FOLDER_NAME,
- ConsumptionUIMessages.TOOLTIP_PWSM_TEXT_JSP_FOLDER,
- INFOPOP_PWSM_TEXT_JSP_FOLDER,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-
-
- new Label( comboGroup_, SWT.NONE );
-
- Group methodsGroup = uiUtils.createGroup( parent, ConsumptionUIMessages.LABEL_METHODS,
- ConsumptionUIMessages.TOOLTIP_PWSM_TREE_METHODS, null );
-
- methodsGroup.setLayoutData( uiUtils.createFillAll() );
-
- GridLayout layout = new GridLayout();
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- methodsGroup.setLayout( layout );
-
- // TODO No infopop for this tree.
- methodsTree_ = uiUtils.createTree( methodsGroup, ConsumptionUIMessages.TOOLTIP_PWSM_TREE_METHODS,
- null,
- SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL | SWT.CHECK );
-
- Composite selectButtons = uiUtils.createComposite( methodsGroup, 2 );
-
- selectAllMethodsButton_
- = uiUtils.createPushButton( selectButtons, ConsumptionUIMessages.BUTTON_SELECT_ALL,
- ConsumptionUIMessages.TOOLTIP_PWSM_BUTTON_SELECT_ALL,
- INFOPOP_PWSM_BUTTON_SELECT_ALL );
- selectAllMethodsButton_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleSelectAll( true );
- }
- });
-
- deselectAllMethodsButton_
- = uiUtils.createPushButton( selectButtons, ConsumptionUIMessages.BUTTON_DESELECT_ALL,
- ConsumptionUIMessages.TOOLTIP_PWSM_BUTTON_DESELECT_ALL,
- INFOPOP_PWSM_BUTTON_DESELECT_ALL );
- deselectAllMethodsButton_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleSelectAll( false );
- }
- });
-
- runTestCheckbox_ = uiUtils.createCheckbox( parent, ConsumptionUIMessages.BUTTON_RUN_TEST,
- ConsumptionUIMessages.TOOLTIP_PWSM_CHECKBOX_LAUNCH,
- INFOPOP_PWSM_CHECKBOX_LAUNCH );
- runTestCheckbox_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleRunTestCheckBox();
- }
- });
-
- return this;
- }
-
- private void handleRunTestCheckBox(){
- boolean enabled = runTestCheckbox_.getSelection();
- runtimesCombo.setEnabled(enabled);
- serverInstanceTypeCombo_.setEnabled(enabled);
-
- }
-
- private void handleFolderText()
- {
- // webContentPath_ is set when jspFolderText_ is set for the first time. Therefore,
- // if webContentPath_ is still null, there is no need to touch jspFolderText_ yet.
-
- if (webContentPath_ == null)
- return;
-
- String folder = sampleFolderText_.getText();
- jspFolderText_.setText(webContentPath_.toString() + IPath.SEPARATOR + folder);
- }
-
- private void handleSampleBrowse()
- {
- IPath selectedPath = null;
- IResource initialResource = null;
-
- try
- {
- initialResource = ResourceUtils.getResourceFromSelection( initialSelection_ );
- }
- catch( CoreException exc )
- {
- }
-
- if( initialResource == null )initialResource = webContent_;
-
- IResource resource = DialogUtils.browseResources( comboGroup_.getShell(),
- webContent_,
- initialResource,
- folderFilter_ );
-
- if( resource != null )
- {
- selectedPath = resource.getFullPath();
-
- int webModuleSegments = selectedPath.matchingFirstSegments(webContentPath_);
-
- sampleFolderText_.removeModifyListener(sampleFolderTextModifyListener);
- sampleFolderText_.removeAll();
-
- if ( webModuleSegments < webContentPath_.segmentCount() )
- {
- sampleFolderText_.add("", 0);
- handleFolderText();
- }
- else
- {
- sampleFolderText_.add(selectedPath.removeFirstSegments(webModuleSegments).toString(), 0);
- handleFolderText();
- }
- sampleFolderText_.select(0);
- sampleFolderText_.restoreWidgetHistory("org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestWidget.sampleFolderText_");
- sampleFolderText_.addModifyListener(sampleFolderTextModifyListener);
-
- }
- }
-
- private void handleTestButton()
- {
- boolean enabled = testCheckbox_.getSelection();
-
- testTypeCombo_.setEnabled( enabled );
-
- if (enabled && testFacilities_ != null) {
- handleTestFacilitySelection();
- return;
- }
-
- sampleFolderText_.setEnabled( enabled );
- methodsTree_.setEnabled( enabled );
- if(canRunTestClient_)
- runTestCheckbox_.setEnabled( enabled );
- selectAllMethodsButton_.setEnabled( enabled );
- deselectAllMethodsButton_.setEnabled( enabled );
- sampleFolderBrowseButton_.setEnabled( enabled );
-
-
-
- }
-
- private void handleTestFacilitySelection() {
-
- String clientTestID = getTestFacility().getSelection();
-
- WebServiceTestExtension testExtension =
- (WebServiceTestExtension) WebServiceTestRegistry.getInstance()
- .getWebServiceExtensionsByName(clientTestID);
-
- boolean hasCodeGen = testExtension.isCodeGenNeeded();
-
- // folder selection is only applicable for test facilities with codegen
- sampleFolderText_.setEnabled( hasCodeGen );
- sampleFolderBrowseButton_.setEnabled( hasCodeGen && webContent_ != null );
-
- boolean hasMethods = testExtension.areMethodsNeeded();
-
- // method selection is only applicable for test facilities with methods
- methodsTree_.setEnabled( hasMethods );
- selectAllMethodsButton_.setEnabled( hasMethods );
- deselectAllMethodsButton_.setEnabled( hasMethods );
-
- // run on server only applicable for test facilities that needs launching
- if(canRunTestClient_)
- runTestCheckbox_.setEnabled( testExtension.isServerNeeded() );
- }
-
- private void handleSelectAll( boolean value )
- {
- TreeItem[] items = methodsTree_.getItems();
-
- for( int i = 0; i < items.length; i++ )
- {
- items[i].setChecked(value);
- }
- }
-
- private void handleServerChange()
- {
- int selection = runtimesCombo.getSelectionIndex();
- serverInstances_.clear();
- serverInstanceTypeCombo_.removeAll();
- IServer[] servers = org.eclipse.wst.server.core.ServerCore.getServers();
- for(int j =0; j<servers.length;j++){
- String id = runtimes_.getId(selection);
- if(id.equals(servers[j].getServerType().getId())){
- serverInstances_.add(servers[j].getId(), servers[j].getName());
- serverInstanceTypeCombo_.add(servers[j].getName());
- }
- }
- serverInstanceTypeCombo_.select(0);
-
- serverInstanceTypeCombo_.setEnabled(serverInstances_.size() > 0 );
- }
-
- // Here are the getters and setters for this widget.
- public void setTestService( Boolean testService )
- {
- testCheckbox_.setSelection( testService.booleanValue() );
- handleTestButton();
- }
-
- public Boolean getTestService()
- {
- return new Boolean( testCheckbox_.getSelection() );
- }
-
- public void setTestFacility( SelectionList testFacilities )
- {
- testFacilities_ = testFacilities;
- testTypeCombo_.setItems( testFacilities.getList() );
- testTypeCombo_.select( testFacilities.getIndex() );
- handleTestFacilitySelection();
- }
-
- public SelectionList getTestFacility()
- {
- testFacilities_.setIndex( testTypeCombo_.getSelectionIndex() );
- return testFacilities_;
- }
-
- public String getTestID()
- {
- return testTypeCombo_.getText();
- }
-
- /**
- * Given a project name which may be of the (obsolete) format "project/module",
- * return only the project part of the name
- *
- * @param project The project name.
- * @return If the name has the format "project/module", returns only "project",
- * otherwise returns the name as is.
- */
- private String extractProjectName(String project) {
-
- int index = project.indexOf("/");
-
- if (index != -1)
- project = project.substring(0, index);
-
- return project;
- }
-
- private String getServerTypeIdForRuntime(IRuntime rt) {
- IServerType[] serverTypes = ServerCore.getServerTypes();
- for (IServerType sType : serverTypes) {
- if (sType.getRuntimeType() == rt.getRuntimeType() ){
- return sType.getId();
-
- }
- }
- return null;
- }
-
- public void initServersTypes()
- {
- if(runtimes_ == null)
- runtimes_ = new LabelsAndIds();
- IServer[] servers = org.eclipse.wst.server.core.ServerCore.getServers();
- IRuntime[] runtimes = org.eclipse.wst.server.core.ServerCore.getRuntimes();
-
- String projectName = projectCombo_.getText();
-
- Set projectFacets = FacetUtils.getFacetsForProject(projectName);
- for(int i = 0;i<runtimes.length;i++){
- boolean showServer = false;
-
- if(runtimes[i].isStub()){
- for(int l =0; l<servers.length;l++){
- if(servers[l].getRuntime() != null){
- if(runtimes[i].getId().equals(servers[l].getRuntime().getId())){
- showServer = true;
- }
- }
- }
- }
- else showServer = true;
-
- if(showServer && canRunTestClient_){
- if(isWebProject){
- org.eclipse.wst.common.project.facet.core.runtime.IRuntime runtime = FacetUtil.getRuntime(runtimes[i]);
- if(FacetUtils.doesRuntimeSupportFacets(runtime, projectFacets)){
- runtimes_.add(getServerTypeIdForRuntime(runtimes[i]), runtimes[i].getName());
- runtimesCombo.add( runtimes[i].getName() );
- }
- }
- else{
- runtimes_.add(getServerTypeIdForRuntime(runtimes[i]), runtimes[i].getName());
- runtimesCombo.add( runtimes[i].getName() );
- }
- }
- }
-
- runtimesCombo.select(0);
- if(serverInstances_ == null)
- serverInstances_ = new LabelsAndIds();
-
-
- String id = runtimes_.getId(0);
- if(id != null){
- for(int k =0; k<servers.length;k++){
- if(servers[k].getServerType() != null){
- if(id.equals(servers[k].getServerType().getId())&& canRunTestClient_){
- serverInstances_.add(servers[k].getId(), servers[k].getName());
- serverInstanceTypeCombo_.add(servers[k].getName());
- }
- }
- }
- serverInstanceTypeCombo_.select(0);
- }
-
- serverInstanceTypeCombo_.setEnabled(canRunTestClient_ && runTestCheckbox_.getSelection());
- runtimesCombo.setEnabled(canRunTestClient_ && runTestCheckbox_.getSelection());
- }
-
-
-
-
- public void setSampleProject(String clientProject)
- {
- projectCombo_.setText(extractProjectName(clientProject));
- }
-
- public void setSampleProjectEAR(String clientProjectEAR)
- {
- earCombo_.setText(extractProjectName(clientProjectEAR));
- }
-
- public String getFolder()
- {
- return sampleFolderText_.getText();
- }
-
- public void setFolder( String folder )
- {
- sampleFolderText_.removeModifyListener(sampleFolderTextModifyListener);
- sampleFolderText_.removeAll();
- sampleFolderText_.add( folder);
- sampleFolderText_.select(0);
- sampleFolderText_.addModifyListener(sampleFolderTextModifyListener);
-
- }
-
- public boolean getIsTestWidget()
- {
- return isTestWidget;
- }
-
- public void setJspFolder( String folder )
- {
- webContentPath_ = (new Path(folder)).removeLastSegments(1);
- webContent_ = ResourceUtils.findResource(webContentPath_);
- sampleFolderBrowseButton_.setEnabled(webContent_ != null);
-
- jspFolderText_.setText( folder );
- }
-
- public String getJspFolder()
- {
- return jspFolderText_.getText();
- }
-
- public void setLaunchedServiceTestName (String launchedServiceTestName)
- {
- }
-
- public boolean getRunTestClient()
- {
- return runTestCheckbox_.getSelection();
- }
-
- public void setRunTestClient( boolean value )
- {
- runTestCheckbox_.setSelection( value );
- }
-
- public void setIsWebProject( boolean value )
- {
- isWebProject = value;
- }
-
- private boolean canRunTestClient_;
-
- public void setCanRunTestClient(boolean canRunTestClient){
- canRunTestClient_ = canRunTestClient;
- if(!canRunTestClient_) {
- runTestCheckbox_.setSelection(false);
- runTestCheckbox_.setEnabled(false);
- }
- }
-
- public void setPopup(boolean popup){
- isPopup = popup;
- if(isPopup){
- UIUtils uiUtils = new UIUtils( pluginId_ );
- runtimesCombo = uiUtils.createCombo( comboGroup_, ConsumptionUIMessages.LABEL_SERVERS_LIST,
- ConsumptionUIMessages.TOOLTIP_PWSM_COMBOBOX_SERVER,
- INFOPOP_PWSM_COMBOBOX_SERVER,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
- runtimesCombo.addSelectionListener(
- new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- handleServerChange();
- }
- }
- );
-
- new Label( comboGroup_, SWT.NONE );
-
-
- serverInstanceTypeCombo_ = uiUtils.createCombo( comboGroup_, ConsumptionUIMessages.LABEL_SERVERS_INSTANCES,
- ConsumptionUIMessages.TOOLTIP_PWSM_COMBOBOX_SERVER_INSTANCE,
- INFOPOP_PWSM_COMBOBOX_SERVER_INSTANCE,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-
- new Label( comboGroup_, SWT.NONE );
- initServersTypes();
-
- }
- }
-
- public boolean getCanRunTestClient()
- {
- return canRunTestClient_;
- }
-
- public String getServerInstanceId(){
- int instanceLabel = serverInstanceTypeCombo_.getSelectionIndex();
- if(instanceLabel == -1) return null;
- return serverInstances_.getId(instanceLabel);
- }
-
-
- public String getExistingServerId(){
- int typeLabel = runtimesCombo.getSelectionIndex();
- if(typeLabel == -1) return null;
- return runtimes_.getId(typeLabel);
- }
-
- public BooleanSelection[] getMethods()
- {
- TreeItem[] items = methodsTree_.getItems();
- BooleanSelection[] methods = new BooleanSelection[items.length];
-
- for( int index = 0; index < items.length; index++ )
- {
- methods[index] = new BooleanSelection( items[index].getText(), items[index].getChecked() );
- }
-
- return methods;
- }
-
- public void setMethods( BooleanSelection[] methods )
- {
- methodsTree_.removeAll();
-
- for( int index = 0; index < methods.length; index++ )
- {
- if(methods[index] == null)continue;
- TreeItem item = new TreeItem( methodsTree_, SWT.NULL );
- item.setText( methods[index].getValue() );
- item.setChecked( methods[index].isSelected() );
- }
- }
-
- public void setInitialSelection( IStructuredSelection selection )
- {
- initialSelection_ = selection;
- }
-
- public IStatus getStatus() {
- if(!canRunTestClient_)
- return StatusUtils.warningStatus(ConsumptionUIMessages.MSG_SERVER_NOT_FOUND_WARNING);
-
- return Status.OK_STATUS;
- }
-
-public void externalize() {
- super.externalize();
- sampleFolderText_.storeWidgetHistory("org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestWidget.sampleFolderText_");
-}
-
-public void internalize() {
- sampleFolderText_.removeModifyListener(sampleFolderTextModifyListener);
- sampleFolderText_.restoreWidgetHistory("org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestWidget.sampleFolderText_");
- sampleFolderText_.addModifyListener(sampleFolderTextModifyListener);
-}
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CopyWebServiceUtilsJarCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CopyWebServiceUtilsJarCommand.java
deleted file mode 100644
index b87d272..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CopyWebServiceUtilsJarCommand.java
+++ /dev/null
@@ -1,137 +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
- * -------- -------- -----------------------------------------------------------
- * 20060912 157039 makandre@ca.ibm.com - Andrew Mak, new webserviceutils.jar not copied in client generation
- * 20061025 161250 makandre@ca.ibm.com - Andrew Mak, Installations or workspace paths with spaces break Sample Gen and Java Editor Launch
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import java.io.File;
-import java.net.URL;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-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.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-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.environment.IStatusHandler;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.common.BundleUtils;
-
-
-public class CopyWebServiceUtilsJarCommand extends AbstractDataModelOperation
-{
- private String sampleProject;
-
-/**
- * Default CTOR;
- */
-
-
-public CopyWebServiceUtilsJarCommand()
-{
-
-}
-
-/**
- * Execute the command
- */
-public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-{
- IEnvironment env = getEnvironment();
-
- try
- {
- ProgressUtils.report( monitor, ConsumptionMessages.PROGRESS_INFO_COPY_WEBSERVICE_UTILS );
- IProject sampleIProject = ProjectUtilities.getProject(sampleProject);
- IPath webModulePath = J2EEUtils.getWebContentPath(sampleIProject);
- if (webModulePath == null)
- return StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_PROJECT_NOT_FOUND );
-
- IStatus status = copyIFile("webserviceutils.jar",webModulePath,"WEB-INF/lib/webserviceutils.jar", WebServiceConsumptionPlugin.getInstance(),env, monitor);
- if(status.getSeverity() == Status.ERROR){
- IStatusHandler sHandler = env.getStatusHandler();
- IStatus errorStatus = StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_FILECOPY_WEBSERVICE_UTILS );
- sHandler.reportError(errorStatus);
- return status;
- }
-
-
- }
- catch (Exception e) {
- IStatusHandler sHandler = env.getStatusHandler();
- IStatus errorStatus = StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_FILECOPY_WEBSERVICE_UTILS );
- sHandler.reportError(errorStatus);
- return StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_FILECOPY_WEBSERVICE_UTILS, e);
- }
- return Status.OK_STATUS;
-}
-
-/**
- *
- */
-private IStatus copyIFile(String source, IPath targetPath, String targetFile, Plugin plugin,IEnvironment env, IProgressMonitor monitor )
-{
-
- if (plugin != null)
- {
- 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);
- IResource resource = FileResourceUtils.findResource(target);
- URL sourceURL = BundleUtils.getURLFromBundle( WebServiceConsumptionPlugin.ID, source );
- if(resource != null) {
- File sourceFile = new File(FileLocator.toFileURL(sourceURL).getPath());
- if (resource.getLocation().toFile().length() == sourceFile.length())
- return Status.OK_STATUS;
- }
- FileResourceUtils.createFile(context,
- target,
- sourceURL.openStream(),
- monitor,
- env.getStatusHandler());
- }
- catch (Exception e) {
- return StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_FILECOPY_WEBSERVICE_UTILS ,e);
- }
- }
- return Status.OK_STATUS;
-}
-
-public void setSampleProject(String sampleProject)
-{
- this.sampleProject = sampleProject;
-}
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishDefaultCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishDefaultCommand.java
deleted file mode 100644
index df42822..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishDefaultCommand.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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
- * -------- -------- -----------------------------------------------------------
- * 20080425 221232 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080527 234169 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-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.CreateServerCommand;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-
-
-/*
-* The JSPGeneration task runs the jsp generation engine found in the
-* JBWizard Plugin
-*
-*
-*/
-public class FinishDefaultCommand extends AbstractDataModelOperation
-{
- private String sampleServerTypeID;
- private IServer sampleExistingServer;
- private String sampleServerInstanceId;
-
-
- public FinishDefaultCommand ()
- {
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IStatus status = Status.OK_STATUS;
- if(sampleServerInstanceId != null){
- sampleExistingServer = ServerCore.findServer(sampleServerInstanceId);
- if (sampleExistingServer != null)
- sampleServerTypeID = sampleExistingServer.getServerType().getId();
- }
- else if(sampleServerTypeID != null){
- CreateServerCommand createServer = new CreateServerCommand();
- createServer.setServerFactoryid(sampleServerTypeID);
- createServer.execute(monitor, adaptable);
- sampleServerInstanceId = createServer.getServerInstanceId();
- if(sampleServerInstanceId != null)
- sampleExistingServer = ServerCore.findServer(sampleServerInstanceId);
-
- }
- return status;
-
- }
-
- public void setServerInstanceId(String serverInstanceId)
- {
- this.sampleServerInstanceId = serverInstanceId;
- }
-
- public String getSampleServerTypeID()
- {
- return sampleServerTypeID;
-
- }
-
- public IServer getSampleExistingServer()
- {
- return sampleExistingServer;
- }
-
- public void setExistingServerId(String existingServerId)
- {
- sampleServerTypeID=existingServerId;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishJavaTestFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishJavaTestFragment.java
deleted file mode 100644
index 94ca347..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishJavaTestFragment.java
+++ /dev/null
@@ -1,64 +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 May 4, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-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.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-
-
-/**
- * @author gilberta
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class FinishJavaTestFragment extends BooleanFragment
-{
- private boolean generateProxy;
-
- public FinishJavaTestFragment()
- {
- SequenceFragment javaTestRoot = new SequenceFragment();
- Condition condition = new Condition()
- {
- public boolean evaluate()
- {
- return generateProxy;
- }
- };
- setCondition(condition);
- javaTestRoot.add(new SimpleFragment(new TestClientDepartureInitCommand(), ""));
- javaTestRoot.add(new SimpleFragment(new BuildProjectCommand(), ""));
- setTrueFragment(javaTestRoot);
- }
-
- public void setGenerateProxy(boolean generateProxy)
- {
- this.generateProxy = generateProxy;
- }
-
- public void setIsJSPGen(boolean jspGen)
- {
-
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishTestFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishTestFragment.java
deleted file mode 100644
index c9eb16f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishTestFragment.java
+++ /dev/null
@@ -1,109 +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
- * -------- -------- -----------------------------------------------------------
- * 20060727 144354 kathy@ca.ibm.com - Kathy Chan
- * 20070502 180304 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-/*
- * Created on May 4, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-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.common.Condition;
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-
-
-/**
- * @author gilberta
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class FinishTestFragment extends BooleanFragment{
-
- private boolean isTestWidget;
- private boolean generateProxy; // This actually represent whether client test is requested
- private String launchedServiceTestName;
- private boolean testService;
- private String testID;
- public FinishTestFragment()
- {
- Condition condition = new Condition()
- {
- public boolean evaluate()
- {
- if(!testService) return false;
- if(launchedServiceTestName == null) return true;
- if(launchedServiceTestName != null)
- if((!launchedServiceTestName.equals("") && (!isPreferedAWSDLTest() || (isTestWidget && isClientTestJava())) && generateProxy) || launchedServiceTestName.equals("")) return true;
-
- return false;
- }
- };
-
- setTrueFragment(new WebServiceTestClientDepartureFragment());
- setCondition(condition);
- }
-
- public void setLaunchedServiceTestName(String launchedServiceTestName)
- {
- this.launchedServiceTestName = launchedServiceTestName;
- }
-
- public boolean isPreferedAWSDLTest()
- {
- ScenarioContext scenarioContext = WebServicePlugin.getInstance().getScenarioContext().copy();
- String[] testTypes = scenarioContext.getWebServiceTestTypes();
- WebServiceTestRegistry wsttRegistry = WebServiceTestRegistry.getInstance();
- WebServiceTestExtension wscte = (WebServiceTestExtension)wsttRegistry.getWebServiceExtensionsByName(testTypes[0]);
- if(wscte.testWSDL())
- return true;
- return false;
- }
-
- public boolean isClientTestJava()
- {
- if(testID == null) return false;
- WebServiceTestRegistry wsttRegistry = WebServiceTestRegistry.getInstance();
- WebServiceTestExtension wscte = (WebServiceTestExtension)wsttRegistry.getWebServiceExtensionsByName(testID);
- if(!wscte.testWSDL())
- return true;
- return false;
- }
-
-
- public void setTestService(boolean testService)
- {
- this.testService = testService;
- }
-
- public void setCanGenerateProxy(boolean generateProxy)
- {
- this.generateProxy = generateProxy;
- }
-
- public void setTestID(String testID)
- {
- this.testID = testID;
- }
-
- public void setIsTestWidget(boolean isTestWidget)
- {
- this.isTestWidget = isTestWidget;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestClientDepartureInitCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestClientDepartureInitCommand.java
deleted file mode 100644
index 21f2f74..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestClientDepartureInitCommand.java
+++ /dev/null
@@ -1,52 +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 Mar 25, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * @author gilberta
- *
- * To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-public class TestClientDepartureInitCommand extends AbstractDataModelOperation
-{
-
- private boolean forceBuild;
-
- public TestClientDepartureInitCommand()
- {
- forceBuild = true;
- }
-
- public boolean getForceBuild()
- {
- return forceBuild;
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
- {
- return Status.OK_STATUS;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestDefaultingFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestDefaultingFragment.java
deleted file mode 100644
index e1b94fc..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestDefaultingFragment.java
+++ /dev/null
@@ -1,141 +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
- * -------- -------- -----------------------------------------------------------
- * 20060727 144354 kathy@ca.ibm.com - Kathy Chan
- * 20060821 153833 makandre@ca.ibm.com - Andrew Mak, Allow the Web Service Test extension point to specify the supported client runtime
- * 20060907 156606 makandre@ca.ibm.com - Andrew Mak, no sample JSP in the pop-up action of Generate Sample JSPs
- * 20090724 284582 mahutch@ca.ibm.com - Mark Hutchinson, WS Test facility selection ignored when wizard completes. Default always chosen
- *******************************************************************************/
-/*
- * Created on May 4, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-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 Style - Code Templates
- */
-public class TestDefaultingFragment extends AbstractDataModelOperation
-{
-
- private SelectionList testFacilities;
- private String launchedServiceTestName;
- private ScenarioContext scenarioContext;
- private boolean generateProxy; // This actually represent whether client test is requested
-
- private String clientRuntimeId_;
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IStatus status = Status.OK_STATUS;
-
- scenarioContext = WebServicePlugin.getInstance().getScenarioContext().copy();
- if (generateProxy || testFacilities == null) {
- selectTestFacility();
- }
- return status;
- }
-
- // The test facilities retrieved from the extension
- // plus the default
- public SelectionList getTestFacility()
- {
- return testFacilities;
- }
-
-
-
- // ***********************
- // This method uses the preference to
- // select the correct test facility
- //
- //***********************
- private void selectTestFacility()
- {
- //if we find something we launched earlier
- //put it on the bottom
- String[] testTypes = scenarioContext.getWebServiceTestTypes();
- List newTestTypes = new ArrayList();
- String[] wsdlCases = scenarioContext.getNonJavaTestService();
- boolean launched = false;
-
- for(int i = 0;i<testTypes.length;i++){
-
- WebServiceTestExtension extension =
- (WebServiceTestExtension) WebServiceTestRegistry.getInstance()
- .getWebServiceExtensionsByName(testTypes[i]);
-
- if (clientRuntimeId_ != null && !extension.supportsRuntime(clientRuntimeId_))
- continue;
-
- if(testTypes[i].equals(launchedServiceTestName))
- launched = true;
- else{
- newTestTypes.add(testTypes[i]);
- }
- }
-
- if(launched)
- newTestTypes.add(launchedServiceTestName);
-
-
- if(!generateProxy)
- testFacilities = new SelectionList(wsdlCases,0);
- else {
- String[] tempArray = new String[newTestTypes.size()];
- testFacilities = new SelectionList((String[]) newTestTypes.toArray(tempArray), 0);
- }
- }
-
- public void setServiceTestFacilities(SelectionList facilities) {
- this.testFacilities = facilities;
- }
-
- public void setLaunchedServiceTestName(String launchedServiceTestName)
- {
- this.launchedServiceTestName = launchedServiceTestName;
- }
-
- public void setGenerateProxy(boolean generateProxy)
- {
- this.generateProxy = generateProxy;
- }
-
- /**
- * Sets the client runtime ID.
- *
- * @param clientRuntimeId The client runtime ID.
- */
- public void setClientRuntimeId(String clientRuntimeId) {
- clientRuntimeId_ = clientRuntimeId;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestWebServiceClient.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestWebServiceClient.java
deleted file mode 100644
index a4efaab..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestWebServiceClient.java
+++ /dev/null
@@ -1,54 +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.consumption.ui.widgets.test;
-
-import org.eclipse.wst.command.internal.env.core.ICommandFactory;
-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 TestWebServiceClient extends AbstractWebServiceClient {
-
- public TestWebServiceClient(WebServiceClientInfo clientInfo){
- super(clientInfo);
- }
-
- 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){
- return null;
- }
-
- 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;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLFinishFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLFinishFragment.java
deleted file mode 100644
index 74553e5..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLFinishFragment.java
+++ /dev/null
@@ -1,30 +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 May 4, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-
-/**
- * @author gilberta
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class WSDLFinishFragment extends BooleanFragment{
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLTestLaunchCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLTestLaunchCommand.java
deleted file mode 100644
index 646a72a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLTestLaunchCommand.java
+++ /dev/null
@@ -1,189 +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 May 4, 2004
- *
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import java.util.List;
-
-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.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestExtension;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry;
-import org.eclipse.wst.command.internal.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-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.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceTester;
-import org.eclipse.wst.ws.internal.wsrt.TestInfo;
-
-/**
- * @author gilberta
- *
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class WSDLTestLaunchCommand extends AbstractDataModelOperation
-{
- private String testID;
- private String launchedServiceTestName;
- private TypeRuntimeServer serviceids;
- private String serverProject;
- private String serverModule;
- private String wsdlURI;
- private boolean externalBrowser;
- private List endpoints;
- private IServer serviceExistingServer = null;
- private String serviceServerTypeID = null;
- private String serviceServerInstanceId = null;
-
- public WSDLTestLaunchCommand()
- {
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
- IStatus status = Status.OK_STATUS;
-
- WebServiceTestRegistry testRegistry = WebServiceTestRegistry.getInstance();
- WebServiceTestExtension wscte = (WebServiceTestExtension)testRegistry.getWebServiceExtensionsByName(testID);
- IWebServiceTester iwst = (IWebServiceTester)wscte.getWebServiceExecutableExtension();
- TestInfo testInfo = getTestInfo();
-
-
- status = commandFactoryExecution(iwst.launch(testInfo),env, monitor);
-
- //Dont need to shut everything down because the wsdl test doesnt work
- if(status.getSeverity() != Status.OK){
- IStatusHandler sHandler = env.getStatusHandler();
- IStatus infoStatus = StatusUtils.infoStatus( ConsumptionUIMessages.MSG_ERROR_UNABLE_TO_LAUNCH_WSDL_TEST );
- sHandler.reportInfo(infoStatus);
- return infoStatus;
- }
- return status;
-
- }
-
- private IStatus commandFactoryExecution(ICommandFactory commandFactory,IEnvironment env, IProgressMonitor monitor)
- {
- IStatus status = Status.OK_STATUS;
- while(commandFactory.hasNext())
- {
- AbstractDataModelOperation operation = commandFactory.getNextCommand();
-
- if (operation != null)
- {
- try
- {
- operation.setEnvironment( env );
- status = operation.execute( monitor, null );
- }
- catch( Exception exc )
- {
- status = StatusUtils.errorStatus( exc );
- }
- }
-
- if(status.getSeverity() == Status.ERROR){
- IStatusHandler sHandler = env.getStatusHandler();
- sHandler.reportError(status);
- return status;
- }
- }
- return status;
- }
-
-
- private TestInfo getTestInfo()
- {
- // get the server stuff
- if (serviceids.getServerInstanceId() != null)
- serviceExistingServer = ServerCore.findServer(serviceids.getServerInstanceId());
- else if (serviceServerInstanceId!=null)
- serviceExistingServer = ServerCore.findServer(serviceServerInstanceId);
-
- if (serviceExistingServer != null)
- serviceServerTypeID = serviceExistingServer.getServerType().getId();
- else
- serviceServerTypeID = serviceids.getServerId();
- // server will be created in ServerDeployableConfigurationCommand
-
- TestInfo testInfo = new TestInfo();
- if (serviceExistingServer!=null)
- testInfo.setServiceExistingServer(serviceExistingServer);
- testInfo.setServiceServerTypeID(serviceServerTypeID);
- testInfo.setServiceProject(serverProject);
- testInfo.setWsdlServiceURL(wsdlURI);
- testInfo.setExternalBrowser(externalBrowser);
- testInfo.setEndpoint(endpoints);
- return testInfo;
-
- }
-
-
- public void setTestID(String testID)
- {
- this.testID = testID;
- }
-
- public String getLaunchedServiceTestName()
- {
- return launchedServiceTestName;
- }
- 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 void setExternalBrowser(boolean externalBrowser)
- {
- this.externalBrowser = externalBrowser;
- }
-
- public void setEndpoint(List endpoints)
- {
- this.endpoints = endpoints;
- }
-
-public String getServerModule() {
- return serverModule;
-}
-
-public void setServerModule(String serverModule) {
- this.serverModule = serverModule;
-}
-
-public void setServiceServerInstanceId(String ssInstanceId){
- this.serviceServerInstanceId = ssInstanceId;
-}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceClientTestArrivalCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceClientTestArrivalCommand.java
deleted file mode 100644
index 91639a1..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceClientTestArrivalCommand.java
+++ /dev/null
@@ -1,277 +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
- * -------- -------- -----------------------------------------------------------
- * 20060608 144500 mahutch@ca.ibm.com - Mark Hutchinson
- * 20060818 153903 makandre@ca.ibm.com - Andrew Mak, Browse does not work in generate client test page
- * 20060906 154548 gilberta@ca.ibm.com - Gilbert Andrews, This fixes name collisions when creating a sample project
- * 20060922 158177 makandre@ca.ibm.com - Andrew Mak, NPE when creating web service client into existing Java project with test
- * 20080507 224433 makandre@ca.ibm.com - Andrew Mak, Need better error message in sample JSP generation when Java proxy bean does not exist
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import java.util.List;
-import java.util.ListIterator;
-
-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.Status;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.JavaMofReflectionCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.selection.BooleanSelection;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.IStatusHandler;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-/**
-* This task sets up all the defaults for the webservice test
-* client page
-*
-*/
-public class WebServiceClientTestArrivalCommand extends AbstractDataModelOperation
-{
- public static final String DEFAULT_WEB_MODULE_ROOT = "WebContent";
- public static final String DEFAULT_SAMPLE_WEB_PROJECT_EXT = "Sample";
-
- public static String SAMPLE_DIR = "sample";
-
- private String clientProject;
- private String clientProjectEAR;
- private String clientP;
- private String clientC;
- private IProject clientIProject;
- private String folder;
- private String jspFolder;
- private BooleanSelection[] methods;
- private String proxyBean;
- private String sampleProject;
- private String sampleP;
- private String sampleC;
- private String sampleProjectEAR;
-
-
-
- /**
- * Constructs a new WebServiceClientTestArrivalTask object with the given label and description.
- */
- public WebServiceClientTestArrivalCommand ()
- {
-
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
-
- if(proxyBean == null){
- IStatusHandler sHandler = env.getStatusHandler();
- IStatus errorStatus = StatusUtils.errorStatus( ConsumptionUIMessages.MSG_ERROR_JTS_PROXY_NOT_COMPILED );
- sHandler.reportError(errorStatus);
- return errorStatus;
-
- }
-
- IStatus status = Status.OK_STATUS;
-
- sampleProjectAndEarSetup(env);
- IPath webcontentPath = null;
-
- // *need* to double-check that clientIProject is a web project
- if (J2EEUtils.isWebComponent(clientIProject))
- webcontentPath = J2EEUtils.getWebContentPath(clientIProject);
-
- //Get the sample Folder ready
- StringBuffer sb = new StringBuffer();
-
- if (webcontentPath != null)
- {
- String path = webcontentPath.toString();
- sb.append(path).append("/");
- }
- else
- { //then just use the default
- sb.append("/").append(sampleC).append("/").append(DEFAULT_WEB_MODULE_ROOT).append("/");
- }
- folder = SAMPLE_DIR + getBean();
-
- sb.append(folder);
- jspFolder = sb.toString();
-
- //get the method names ready
- //find the full path of the file in the project
- /*
- * Getting the method names using javamof introspection
- */
-
- JavaMofReflectionCommand javamofcommand = new JavaMofReflectionCommand();
- javamofcommand.setProxyBean(proxyBean);
- javamofcommand.setClientProject(clientP);
- javamofcommand.setEnvironment( env );
-
-
-
- try{
- IStatus mofStatus = javamofcommand.execute( monitor, null);
- if(mofStatus.getSeverity() == Status.ERROR)
- return mofStatus;
- }catch(Exception exc){
- IStatusHandler sHandler = env.getStatusHandler();
- IStatus errorStatus = StatusUtils.errorStatus( ConsumptionUIMessages.MSG_ERROR_JTS_PROXY_NOT_COMPILED );
- sHandler.reportError(errorStatus);
- return errorStatus;
- }
- JavaHelpers javaHelpers = javamofcommand.getJavaClass();
- if (javaHelpers == null) return status;
-
- JavaClass javaClass = null;
- if(javaHelpers instanceof JavaClass)
- javaClass = (JavaClass)javaHelpers;
- else return status;
- List methodList = javaClass.getPublicMethods();
- BooleanSelection[] tempMethods = new BooleanSelection[methodList.size()];
- ListIterator listIterator = methodList.listIterator();
-
- int j = 0;
- while (listIterator.hasNext())
- {
- Method method = (Method)listIterator.next();
- if(method.isConstructor()) continue;
-
- tempMethods[j] = new BooleanSelection( method.getMethodElementSignature(), true);
- j++;
- }
- methods = tempMethods;
- return status;
- }
- public static final String DEFAULT_SAMPLE_EAR_PROJECT_EXT = "EAR";
-
- private void sampleProjectAndEarSetup(IEnvironment env)
- {
- if(clientProject == null) return;
- else{
- int index = clientProject.indexOf("/");
- clientP = clientProject.substring(0,index);
- clientC = clientProject.substring(index + 1);
- }
-
- clientIProject = (IProject)ProjectUtilities.getProject(clientP);
-
- if(J2EEUtils.isWebComponent(clientIProject)){
- sampleProject = clientProject;
- sampleP = clientP;
- sampleC = clientC;
- }
- else{
- sampleP = clientP + DEFAULT_SAMPLE_WEB_PROJECT_EXT;
- sampleC = clientC + DEFAULT_SAMPLE_WEB_PROJECT_EXT;
- sampleProject = sampleP + "/" + sampleC;
-
- String sampleTemp = sampleP;
-
- boolean nameFound = false;
- int i = 1;
- while(!nameFound){
- IProject sampleIProject = (IProject)ProjectUtilities.getProject(sampleTemp);
- if(sampleIProject.exists() && !J2EEProjectUtilities.isDynamicWebProject(sampleIProject)){
- sampleTemp = sampleP + Integer.toString(i);
- sampleProject = sampleTemp + "/" + sampleC;
-
- }
- else
- nameFound = true;
-
- i++;
- }
- sampleP = sampleTemp;
-
- }
-
-
-
-
- sampleProjectEAR = clientProjectEAR;
- if (sampleProjectEAR == null || sampleProjectEAR.length()==0){
- sampleProjectEAR = sampleP + DEFAULT_SAMPLE_EAR_PROJECT_EXT + "/" + sampleC + DEFAULT_SAMPLE_EAR_PROJECT_EXT;
- }
-
- }
-
- //getters and setters
-
- private String getBean()
- {
- int index = proxyBean.lastIndexOf(".");
- String end = "";
- if(index != -1){
- end = proxyBean.substring(index + 1);
- }
- String bean = end.substring(0,end.length());
-
- return bean;
- }
-
-
-
-
- public String getFolder()
- {
- return folder;
- }
-
- public String getJspFolder()
- {
- return jspFolder;
- }
-
- public BooleanSelection[] getMethods()
- {
- return methods;
- }
-
- public String getSampleProject()
- {
- return sampleProject;
- }
-
- public void setClientProject(String clientProject)
- {
- this.clientProject = clientProject;
- }
-
-
- public void setClientProjectEAR(String clientProjectEAR)
- {
- this.clientProjectEAR = clientProjectEAR;
- }
-
-
- public void setProxyBean(String proxyBean)
- {
- this.proxyBean = proxyBean;
- }
-
- public String getSampleProjectEAR()
- {
- return sampleProjectEAR;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceTestClientDepartureFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceTestClientDepartureFragment.java
deleted file mode 100644
index fd945a7..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceTestClientDepartureFragment.java
+++ /dev/null
@@ -1,50 +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 Mar 25, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample.AddModuleDependenciesCommand;
-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;
-
-
-/**
- * @author gilberta
- *
- * To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-public class WebServiceTestClientDepartureFragment extends SequenceFragment
-{
- public WebServiceTestClientDepartureFragment()
- {
- add(new SimpleFragment(new FinishDefaultCommand(),""));
- add(new SimpleFragment(new ClientTestDelegateCommand(),""));
- }
-
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- dataRegistry.addMapping(TestClientDepartureInitCommand.class, "ForceBuild",BuildProjectCommand.class);
- dataRegistry.addMapping(FinishDefaultCommand.class, "SampleServerTypeID",AddModuleDependenciesCommand.class);
- dataRegistry.addMapping(FinishDefaultCommand.class, "SampleExistingServer",AddModuleDependenciesCommand.class);
- dataRegistry.addMapping(FinishDefaultCommand.class, "SampleServerTypeID",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(FinishDefaultCommand.class, "SampleExistingServer",ClientTestDelegateCommand.class);
-
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/ExplorerServiceTestCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/ExplorerServiceTestCommand.java
deleted file mode 100644
index bee7b63..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/ExplorerServiceTestCommand.java
+++ /dev/null
@@ -1,97 +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.consumption.ui.widgets.test.explorer;
-
-import java.util.Iterator;
-import java.util.List;
-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.ext.test.WSDLTestFinishCommand;
-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.explorer.LaunchOption;
-import org.eclipse.wst.ws.internal.explorer.LaunchOptions;
-import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand;
-import org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin;
-
-public class ExplorerServiceTestCommand extends AbstractDataModelOperation implements WSDLTestFinishCommand
-{
-
- private boolean externalBrowser = true;
- private String wsdlServiceURL;
- private List endpoints;
-
- /**
- * Constructs a new WebServiceExplorerLaunch object with the given label and description.
- */
- public ExplorerServiceTestCommand ()
- {
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
-
- IStatus status = Status.OK_STATUS;
-
- WSExplorerLauncherCommand launchCommand = new WSExplorerLauncherCommand();
- launchCommand.setForceLaunchOutsideIDE(externalBrowser);
- Vector launchOptionVector = new Vector();
- String stateLocation = ExplorerPlugin.getInstance().getPluginStateLocation();
- String defaultFavoritesLocation = ExplorerPlugin.getInstance().getDefaultFavoritesLocation();
- launchOptionVector.add(new LaunchOption(LaunchOptions.STATE_LOCATION,stateLocation));
- launchOptionVector.add(new LaunchOption(LaunchOptions.DEFAULT_FAVORITES_LOCATION,defaultFavoritesLocation));
- launchOptionVector.add(new LaunchOption(LaunchOptions.WSDL_URL,wsdlServiceURL));
- if (endpoints != null)
- for (Iterator it = endpoints.iterator(); it.hasNext();)
- launchOptionVector.add(new LaunchOption(LaunchOptions.WEB_SERVICE_ENDPOINT, it.next().toString()));
- launchCommand.setLaunchOptions((LaunchOption[])launchOptionVector.toArray(new LaunchOption[0]));
- launchCommand.setEnvironment( env );
- status = launchCommand.execute( monitor, null );
- return status;
- }
-
- public void setExternalBrowser(boolean externalBrowser)
- {
- this.externalBrowser = externalBrowser;
- }
-
- public void setWsdlServiceURL(String wsdlServiceURL)
- {
- this.wsdlServiceURL = wsdlServiceURL;
- }
-
- public void setServerTypeID(String serviceServerTypeID)
- {
- //TODO: Type mappings to this property should be removed.
- }
-
- public void setExistingServer(IServer serviceExistingServer)
- {
- //TODO: Type mappings to this property should be removed.
- }
-
- public void setServiceProject(String serviceProject)
- {
- //TODO: Type mappings to this property should be removed.
- }
-
- public void setEndpoint(List endpoints)
- {
- this.endpoints = endpoints;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEGenerateCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEGenerateCommand.java
deleted file mode 100644
index 8ad6eeb..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEGenerateCommand.java
+++ /dev/null
@@ -1,60 +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.consumption.ui.widgets.test.explorer;
-
-import java.util.Iterator;
-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.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.explorer.LaunchOption;
-import org.eclipse.wst.ws.internal.explorer.LaunchOptions;
-import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand;
-import org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin;
-import org.eclipse.wst.ws.internal.wsrt.TestInfo;
-
-public class WSEGenerateCommand extends AbstractDataModelOperation
-{
-
- private TestInfo testInfo;
-
- public WSEGenerateCommand(TestInfo testInfo){
- this.testInfo = testInfo;
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
-
- IStatus status = Status.OK_STATUS;
-
- WSExplorerLauncherCommand launchCommand = new WSExplorerLauncherCommand();
- launchCommand.setForceLaunchOutsideIDE(testInfo.getExternalBrowser());
- Vector launchOptionVector = new Vector();
- String stateLocation = ExplorerPlugin.getInstance().getPluginStateLocation();
- String defaultFavoritesLocation = ExplorerPlugin.getInstance().getDefaultFavoritesLocation();
- launchOptionVector.add(new LaunchOption(LaunchOptions.STATE_LOCATION,stateLocation));
- launchOptionVector.add(new LaunchOption(LaunchOptions.DEFAULT_FAVORITES_LOCATION,defaultFavoritesLocation));
- launchOptionVector.add(new LaunchOption(LaunchOptions.WSDL_URL,testInfo.getWsdlServiceURL()));
- if (testInfo.getEndpoint() != null)
- for (Iterator it = testInfo.getEndpoint().iterator(); it.hasNext();)
- launchOptionVector.add(new LaunchOption(LaunchOptions.WEB_SERVICE_ENDPOINT, it.next().toString()));
- launchCommand.setLaunchOptions((LaunchOption[])launchOptionVector.toArray(new LaunchOption[0]));
- launchCommand.setEnvironment( env );
- status = launchCommand.execute( monitor, null );
- return status;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEWebServiceTester.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEWebServiceTester.java
deleted file mode 100644
index cfa116d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEWebServiceTester.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.consumption.ui.widgets.test.explorer;
-
-import java.util.Vector;
-
-import org.eclipse.wst.command.internal.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceTester;
-import org.eclipse.wst.ws.internal.wsrt.TestInfo;
-
-public class WSEWebServiceTester implements IWebServiceTester {
-
- public ICommandFactory generate(TestInfo testInfo){
- Vector commands = new Vector();
- return new SimpleCommandFactory(commands);
- }
-
- public ICommandFactory launch(TestInfo testInfo){
- Vector commands = new Vector();
- commands.add(new WSEGenerateCommand(testInfo));
- return new SimpleCommandFactory(commands);
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WebServiceExplorerExecutable.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WebServiceExplorerExecutable.java
deleted file mode 100644
index dbfc9ae..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WebServiceExplorerExecutable.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test.explorer;
-
-import org.eclipse.jst.ws.internal.ext.WebServiceExecutable;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
-* This is the interface for objects that represent a kind of
-* Web Service-Server-Runtime artifact. The primary purpose of a WebServiceServerRuntimeType
-* object is to manufacture the wizard pages that support the type, server, and runtime configuration.
-*/
-public class WebServiceExplorerExecutable implements WebServiceExecutable
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public AbstractDataModelOperation getFinishCommand()
- {
- return new ExplorerServiceTestCommand();
- }
-
-}
-
-
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/AddModuleDependenciesCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/AddModuleDependenciesCommand.java
deleted file mode 100644
index c604bf8..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/AddModuleDependenciesCommand.java
+++ /dev/null
@@ -1,248 +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
- * -------- -------- -----------------------------------------------------------
- * 20060324 122799 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060503 138478 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060510 141115 rsinha@ca.ibm.com - Rupam Kuehner
- * 20071212 200193 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080211 117924 trungha@ca.ibm.com - Trung Ha
- * 20080325 184761 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080527 234169 gilberta@ca.ibm.com - Gilbert Andrews
- * 20081001 243869 ericdp@ca.ibm.com - Eric D. Peters, Web Service tools allowing mixed J2EE levels
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample;
-
-import java.io.IOException;
-
-import org.eclipse.core.commands.ExecutionException;
-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.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.classpathdep.UpdateClasspathAttributeUtil;
-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.AddModuleToServerCommand;
-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.RequiredFacetVersion;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.command.StartServerCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ValidationUtils;
-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.wsrt.TestInfo;
-
-public class AddModuleDependenciesCommand extends AbstractDataModelOperation
-{
-
- private TestInfo testInfo;
-
- private IProject sampleIProject;
- private IProject clientIProject;
- private IProject sampleEARIProject;
- private String sampleEARProject;
-
- public AddModuleDependenciesCommand(TestInfo testInfo)
- {
- this.testInfo = testInfo;
- }
-
- /**
- * Execute WebServerDefaultingTask Set the default server name and id given a
- * deployable.
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
- //1. Create a Web project for the sample if one does not already exist.
- sampleIProject = ProjectUtilities.getProject(testInfo.getGenerationProject());
- boolean createdSampleProject = false;
- ValidationUtils vu = new ValidationUtils();
- boolean serverNeedsEAR = vu.serverNeedsEAR(testInfo.getClientServerTypeID());
- if (serverNeedsEAR) {
- if (testInfo.getClientEARProject() == null
- || testInfo.getClientEARProject().length() == 0) {
- sampleEARProject = testInfo.getGenerationProject() + DEFAULT_SAMPLE_EAR_PROJECT_EXT;
- } else {
- sampleEARProject = testInfo.getClientEARProject();
- }
- }
- if (!sampleIProject.exists())
- {
- CreateFacetedProjectCommand command = new CreateFacetedProjectCommand();
- command.setProjectName(testInfo.getGenerationProject());
- command.setTemplateId(IJ2EEModuleConstants.JST_WEB_TEMPLATE);
- // RequiredFacetVersions is set to an empty array because we don't need to impose any additional constraints.
- // We just want to create the highest level of Web project that the selected server supports.
- command.setRequiredFacetVersions(new RequiredFacetVersion[0]);
- command.setServerFactoryId(testInfo.getClientServerTypeID());
- command.setServerInstanceId(testInfo.getClientExistingServer().getId());
- command.setEarProjectName(sampleEARProject);
- IStatus status = command.execute( monitor, adaptable );
- if (status.getSeverity() == Status.ERROR)
- {
- env.getStatusHandler().reportError( status );
- return status;
- }
- createdSampleProject = true;
- }
-
- //2. If the selected server requires an EAR and no EAR name
- //has been provided, choose an EAR name and create it if it doesn't exist.
- if (serverNeedsEAR) {
- sampleEARIProject = ProjectUtilities.getProject(sampleEARProject);
- if (sampleEARIProject == null || !sampleEARIProject.exists())
- {
- CreateFacetedProjectCommand command = new CreateFacetedProjectCommand();
- command.setProjectName(sampleEARProject);
- command.setTemplateId(IJ2EEModuleConstants.JST_EAR_TEMPLATE);
- // RequiredFacetVersions is set to an empty array because we don't need to impose any additional constraints.
- // We just want to create the highest level of Web project that the selected server supports.
- command.setRequiredFacetVersions(new RequiredFacetVersion[0]);
- command.setServerFactoryId(testInfo.getClientServerTypeID());
- command.setServerInstanceId(testInfo.getClientExistingServer().getId());
- IStatus status = command.execute( monitor, adaptable );
- if (status.getSeverity() == Status.ERROR)
- {
- env.getStatusHandler().reportError( status );
- return status;
- }
- }
-
- }
-
- // 3. If the selected server requires an EAR, and the sample project has
- // not already been added to the EAR, add it.
- if (serverNeedsEAR)
- {
- AssociateModuleWithEARCommand associateCommand = new AssociateModuleWithEARCommand();
- associateCommand.setProject(testInfo.getGenerationProject());
- associateCommand.setEARProject(sampleEARProject);
- associateCommand.setEar(sampleEARProject);
- associateCommand.setEnvironment( env );
- IStatus status = associateCommand.execute( monitor, null );
- if (status.getSeverity()==Status.ERROR)
- {
- env.getStatusHandler().reportError(status);
- }
- }
-
-
-
-
- // 4. If server requires an EAR, and the sample EAR has not already been
- // added to the server, add it.
- // If no EAR is required, and sample project has not been added to the server add it.
- if (serverNeedsEAR && testInfo.getClientExistingServer() != null)
- {
- //Add sampleEARIProject to the server if needed.
- AddModuleToServerCommand modToServer = new AddModuleToServerCommand();
- modToServer.setModule(sampleEARProject);
- modToServer.setProject(sampleEARProject);
- modToServer.setServerInstanceId(testInfo.getClientExistingServer().getId());
- modToServer.setEnvironment( env );
- IStatus status = modToServer.execute( monitor, null );
- if (status.getSeverity()==Status.ERROR)
- {
- env.getStatusHandler().reportError(status);
- }
- }
- else
- {
- //add sampleIProject directly to the server if needed.
- if(testInfo.getClientExistingServer()!= null){
- AddModuleToServerCommand addToServer = new AddModuleToServerCommand();
- addToServer.setModule(testInfo.getGenerationProject());
- addToServer.setProject(testInfo.getGenerationProject());
- addToServer.setServerInstanceId(testInfo.getClientExistingServer().getId());
- addToServer.setEnvironment( env );
- IStatus status = addToServer.execute( monitor, null );
- if (status.getSeverity()==Status.ERROR)
- {
- env.getStatusHandler().reportError(status);
- }
- }
- }
-
- //5. Call StartServerCommand if this command had to create the sample project.
- if (createdSampleProject)
- {
- StartServerCommand startServer = new StartServerCommand(true);
- startServer.setServerInstanceId(testInfo.getClientExistingServer().getId());
- startServer.setEnvironment( env );
- IStatus status = startServer.execute( monitor, null );
- if (status.getSeverity()==Status.ERROR)
- {
- env.getStatusHandler().reportError(status);
- }
- }
-
-
- //6. Establish all necessary dependencies between client project, sample project, and EAR
-
- clientIProject = ProjectUtilities.getProject(testInfo.getClientProject());
-
- if (clientIProject != null && !J2EEUtils.isWebComponent(clientIProject)) {
- if (J2EEUtils.isJavaComponent(clientIProject)) {
- J2EEUtils.addJavaProjectAsUtilityJar(clientIProject, sampleEARIProject, monitor);
- J2EEUtils.addJavaProjectAsUtilityJar(clientIProject, sampleIProject,monitor);
- }
-
- try
- {
- String uri = clientIProject.getName() + ".jar";
- J2EEUtils.addJAROrModuleDependency(sampleIProject, uri);
-
- // Adding the attribute to the referenced project's classpath entries of 'lib' kind
- // so that these libs will be bundled along with the project when exported
- IClasspathEntry[] classPath = JavaCore.create(clientIProject).getRawClasspath();
- for (int i = 0; i < classPath.length; i++) {
- IClasspathEntry classpathEntry = classPath[i];
- if ( classpathEntry.getEntryKind() == IClasspathEntry.CPE_LIBRARY ){
- UpdateClasspathAttributeUtil.addDependencyAttribute(monitor, clientIProject.getName(), classpathEntry);
- }
- }
-
- } catch (CoreException ce)
- {
- String errorMessage = NLS.bind(ConsumptionUIMessages.MSG_ERROR_MODULE_DEPENDENCY, new String[]{sampleIProject.getName(), clientIProject.getName()});
- IStatus errorStatus = StatusUtils.errorStatus(errorMessage);
- env.getStatusHandler().reportError(errorStatus);
- } catch (IOException ioe)
- {
- String errorMessage = NLS.bind(ConsumptionUIMessages.MSG_ERROR_MODULE_DEPENDENCY, new String[]{sampleIProject.getName(), clientIProject.getName()});
- IStatus errorStatus = StatusUtils.errorStatus(errorMessage);
- env.getStatusHandler().reportError(errorStatus);
- } catch (ExecutionException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
-
- }
-
- return Status.OK_STATUS;
- }
-
-
-
-
- public static final String DEFAULT_SAMPLE_EAR_PROJECT_EXT = "EAR";
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCGenerateCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCGenerateCommand.java
deleted file mode 100644
index 3ee6aec..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCGenerateCommand.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2012 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20120409 376345 yenlu@ca.ibm.com, kchong@ca.ibm.com - Stability improvements to web services commands/operations
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample;
-
-import org.eclipse.core.resources.IFile;
-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.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.InputFileGenerator;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.MethodFileGenerator;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.ResultFileGenerator;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.TestClientFileGenerator;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.command.GeneratePageCommand;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.command.JavaToModelCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.CopyWebServiceUtilsJarCommand;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EnvironmentUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.wsrt.TestInfo;
-
-public class GSTCGenerateCommand extends AbstractDataModelOperation
-{
-
- public static String INPUT = "Input.jsp";
- public static String TEST_CLIENT = "TestClient.jsp";
- public static String RESULT = "Result.jsp";
- public static String METHOD = "Method.jsp";
-
- private TestInfo testInfo;
- private Model proxyModel;
- private String jspfolder;
-
- public GSTCGenerateCommand(TestInfo testInfo){
- this.testInfo = testInfo;
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
- IStatus status = Status.OK_STATUS;
- CopyWebServiceUtilsJarCommand copy = new CopyWebServiceUtilsJarCommand();
- copy.setSampleProject(testInfo.getGenerationProject());
- copy.setEnvironment( env );
- status = copy.execute( monitor, null);
- if (status.getSeverity() == Status.ERROR) return status;
- setJSPFolder();
- status = createModel(env, monitor);
- if (status.getSeverity() == Status.ERROR) return status;
- status = generatePages(env);
- if (status.getSeverity() == Status.ERROR) return status;
- BuildProjectCommand buildProjectCommand = new BuildProjectCommand();
- buildProjectCommand.setEnvironment(env);
- buildProjectCommand.setForceBuild(true);
- buildProjectCommand.setProject(ResourcesPlugin.getWorkspace().getRoot().getProject(testInfo.getGenerationProject()));
- return buildProjectCommand.execute(monitor, adaptable);
- }
-
- private void setJSPFolder(){
- //if the client is not a webcomponent then the
- //sample must have been created, we must now factor in
- //flexible projects
-
- IProject clientIProject = ProjectUtilities.getProject(testInfo.getClientProject());
- if (clientIProject != null && !J2EEUtils.isWebComponent(clientIProject)){
- IProject project = ProjectUtilities.getProject(testInfo.getGenerationProject());
- IPath path = J2EEUtils.getWebContentPath(project);
- int index = testInfo.getJspFolder().lastIndexOf("/");
- String jsp = testInfo.getJspFolder().substring(index + 1);
- StringBuffer sb = new StringBuffer();
- sb.append("/").append(path.toString()).append("/").append(jsp);
- jspfolder = sb.toString();
- }
- else
- jspfolder = testInfo.getJspFolder();
-
-
- }
-
- //create the model from the resource
- private IStatus createModel(IEnvironment env, IProgressMonitor monitor ) {
- JavaToModelCommand jtmc = new JavaToModelCommand();
- jtmc.setMethods(testInfo.getMethods());
- jtmc.setClientProject(testInfo.getClientProject());
- jtmc.setProxyBean(testInfo.getProxyBean());
- jtmc.setEnvironment( env );
- IStatus status = jtmc.execute( monitor, null);
- if (status.getSeverity() == Status.ERROR) return status;
- proxyModel = jtmc.getJavaDataModel();
- return status;
- }
-
- /**
- * Generate the four jsps that make up this
- * sample app.
- */
- private IStatus generatePages(IEnvironment env)
- {
- IStatus status = Status.OK_STATUS;
- IPath fDestinationFolderPath = new Path(jspfolder);
- fDestinationFolderPath = fDestinationFolderPath.makeAbsolute();
- IWorkspaceRoot fWorkspace = ResourcesPlugin.getWorkspace().getRoot();
-
- IPath pathTest = fDestinationFolderPath.append(TEST_CLIENT);
- IFile fileTest = fWorkspace.getFile(pathTest);
- GeneratePageCommand gpcTest = new GeneratePageCommand(EnvironmentUtils.getResourceContext(env), proxyModel,
- new TestClientFileGenerator(INPUT,METHOD,RESULT),fileTest);
- //gpcTest.setStatusMonitor(getStatusMonitor());
- gpcTest.setEnvironment( env );
- status = gpcTest.execute( null, null );
- if (status.getSeverity() == Status.ERROR )
- return status;
-
-
- //input codegen
- IPath pathInput = fDestinationFolderPath.append(INPUT);
- IFile fileInput = fWorkspace.getFile(pathInput);
- InputFileGenerator inputGenerator = new InputFileGenerator(RESULT);
- GeneratePageCommand gpcInput = new GeneratePageCommand(EnvironmentUtils.getResourceContext(env), proxyModel,
- inputGenerator,fileInput);
- //gpcInput.setStatusMonitor(getStatusMonitor());
- gpcInput.setEnvironment( env );
- status = gpcInput.execute( null, null );
- if (status.getSeverity() == Status.ERROR )
- return status;
-
- //method codegen
- IPath pathMethod = fDestinationFolderPath.append(METHOD);
- IFile fileMethod = fWorkspace.getFile(pathMethod);
- MethodFileGenerator methodGenerator = new MethodFileGenerator(INPUT);
- methodGenerator.setClientFolderPath(jspfolder);
- GeneratePageCommand gpcMethod = new GeneratePageCommand(EnvironmentUtils.getResourceContext(env), proxyModel,
- methodGenerator,fileMethod);
- //gpcMethod.setStatusMonitor(getStatusMonitor());
- gpcMethod.setEnvironment( env );
- status = gpcMethod.execute( null, null );
- if (status.getSeverity() == Status.ERROR )
- return status;
-
-
- //result codegen
- IPath pathResult = fDestinationFolderPath.append(RESULT);
- IFile fileResult = fWorkspace.getFile(pathResult);
- ResultFileGenerator rfg = new ResultFileGenerator();
- rfg.setClientFolderPath(jspfolder);
- rfg.setSetEndpointMethod(testInfo.getSetEndpointMethod());
- GeneratePageCommand gpcResult = new GeneratePageCommand(EnvironmentUtils.getResourceContext(env), proxyModel,
- rfg,fileResult);
- gpcResult.setEnvironment( env );
- status = gpcResult.execute( null, null );
-
- return status;
- }
-
-
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCLaunchCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCLaunchCommand.java
deleted file mode 100644
index 08bb782..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCLaunchCommand.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 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
- * -------- -------- -----------------------------------------------------------
- * 20060418 134322 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060424 124368 kathy@ca.ibm.com - Kathy Chan
- * 20090312 250984 mahutch@ca.ibm.com - Mark Hutchinson, Use another mechanism to wait for build to be completed
- * 20091201 296529 yenlu@ca.ibm.com - Yen Lu, Determination of when the sample JSP goes live is not robust.
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample;
-
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.commands.ExecutionException;
-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.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildBeanCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.command.StartServerCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.browser.IWebBrowser;
-import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
-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.environment.StatusException;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.TestInfo;
-
-public class GSTCLaunchCommand extends AbstractDataModelOperation
-{
-
- public static String INPUT = "Input.jsp";
- public static String TEST_CLIENT = "TestClient.jsp";
- public static String RESULT = "Result.jsp";
- public static String METHOD = "Method.jsp";
-
- private TestInfo testInfo;
- private String jspfolder;
-
- public GSTCLaunchCommand(TestInfo testInfo){
- this.testInfo = testInfo;
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
-
- setJSPFolder();
-
- return launchSample(env, monitor);
- }
- private void setJSPFolder(){
- //if the client is not a webcomponent then the
- //sample must have been created, we must now factor in
- //flexible projects
-
- IProject clientIProject = ProjectUtilities.getProject(testInfo.getClientProject());
- if (clientIProject != null && !J2EEUtils.isWebComponent(clientIProject)){
- IProject project = ProjectUtilities.getProject(testInfo.getGenerationProject());
- IPath path = J2EEUtils.getWebContentPath(project);
- int index = testInfo.getJspFolder().lastIndexOf("/");
- String jsp = testInfo.getJspFolder().substring(index + 1);
- StringBuffer sb = new StringBuffer();
- sb.append("/").append(path.toString()).append("/").append(jsp);
- jspfolder = sb.toString();
- }
- else
- jspfolder = testInfo.getJspFolder();
-
-
- }
-
- private IStatus launchSample (IEnvironment env, IProgressMonitor monitor ) {
- IStatus status = Status.OK_STATUS;
- IPath fDestinationFolderPath = new Path(jspfolder);
- fDestinationFolderPath = fDestinationFolderPath.makeAbsolute();
-
- IProject sampleProject = ProjectUtilities.getProject(testInfo.getGenerationProject());
-
- BuildBeanCommand buildCommand = new BuildBeanCommand();
- buildCommand.setEnvironment(env);
- buildCommand.setProject(sampleProject);
- try {
- //ensure the sample project is built
- buildCommand.execute(monitor, null);
- } catch (ExecutionException e2) {
- //just ignore and see if we can move on
- }
-
- StartServerCommand serverCommand = new StartServerCommand( true );
- serverCommand.setServerInstanceId( testInfo.getClientExistingServer().getId() );
- serverCommand.setEnvironment( env );
-
- status = serverCommand.execute(monitor, null);
- if (status.getSeverity() == Status.ERROR) return status;
-
- String newPath = ServerUtils.getWebComponentURL(sampleProject, testInfo.getClientServerTypeID(),testInfo.getClientExistingServer());
- int count = J2EEUtils.getWebContentPath(sampleProject).segmentCount();
-
- newPath = newPath + "/" + fDestinationFolderPath.removeFirstSegments(count);
- StringBuffer urlString = new StringBuffer( newPath + "/" + TEST_CLIENT );
- if (testInfo.getEndpoint() != null && !testInfo.getEndpoint().isEmpty())
- {
- urlString.append("?endpoint=");
- urlString.append(testInfo.getEndpoint().get(0).toString());
- }
-
- try{
- URL url;
- url = new URL(urlString.toString());
-
- for( int retries = 0; retries < 20; retries++ )
- {
- try
- {
- // Test the URLs
- URL sampleUrl = new URL(newPath + "/" + RESULT);
- HttpURLConnection urlConn = (HttpURLConnection)sampleUrl.openConnection();
- int responseCode = urlConn.getResponseCode();
- //System.out.println(retries + ": result HTTP code = " + responseCode);
- //dumpUrlContents(urlConn);
- if (responseCode != HttpURLConnection.HTTP_OK)
- throw new IOException();
-
- sampleUrl = new URL(newPath + "/" + METHOD);
- urlConn = (HttpURLConnection)sampleUrl.openConnection();
- responseCode = urlConn.getResponseCode();
- //System.out.println(retries + ": method HTTP code = " + responseCode);
- //dumpUrlContents(urlConn);
- if (responseCode != HttpURLConnection.HTTP_OK)
- throw new IOException();
-
- sampleUrl = new URL(newPath + "/" + INPUT);
- urlConn = (HttpURLConnection)sampleUrl.openConnection();
- responseCode = urlConn.getResponseCode();
- //System.out.println(retries + ": input HTTP code = " + responseCode);
- //dumpUrlContents(urlConn);
- if (responseCode != HttpURLConnection.HTTP_OK)
- throw new IOException();
-
- sampleUrl = new URL(newPath + "/" + TEST_CLIENT);
- urlConn = (HttpURLConnection)sampleUrl.openConnection();
- responseCode = urlConn.getResponseCode();
- //System.out.println(retries + ": test client HTTP code = " + responseCode);
- //dumpUrlContents(urlConn);
- if (responseCode != HttpURLConnection.HTTP_OK)
- throw new IOException();
-
- // Looks good, exit loop
- break;
- }
- catch( IOException ioe )
- {
- try
- {
- Thread.sleep(1000);
- }
- catch (InterruptedException ie) {}
- }
- }
-
- IWorkbenchBrowserSupport browserSupport = WebServiceConsumptionUIPlugin.getInstance().getWorkbench().getBrowserSupport();
- IWebBrowser browser = browserSupport.createBrowser(IWorkbenchBrowserSupport.LOCATION_BAR, null, null, null);
- browser.openURL(url);
- return status;
- }catch(PartInitException exc){
- env.getLog().log(ILog.ERROR, 5048, this, "launchSample", exc);
- status = StatusUtils.errorStatus(exc.getMessage(), exc);
- env.getStatusHandler().reportError(status);
- return status;
- }catch(MalformedURLException exc){
- env.getLog().log(ILog.WARNING, 5048, this, "launchSample", exc);
- status = StatusUtils.warningStatus( ConsumptionUIMessages.MSG_ERROR_MALFORMED_URL, exc );
- try {
- env.getStatusHandler().report(status);
- } catch (StatusException e) {
- status = StatusUtils.errorStatus( ConsumptionUIMessages.MSG_ERROR_MALFORMED_URL, e );
- }
- return status;
- }
- }
-/*
- private void dumpUrlContents(URLConnection conn)
- {
- InputStream is = null;
- try
- {
- is = conn.getInputStream();
- BufferedReader br = new BufferedReader(new InputStreamReader(is));
- String s = null;
- while ((s = br.readLine()) != null)
- System.out.println(s);
- }
- catch (IOException e)
- {
- }
- finally
- {
- if (is != null)
- {
- try
- {
- is.close();
- }
- catch (IOException e)
- {
- }
- }
- }
- }
-*/
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCWebServiceTester.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCWebServiceTester.java
deleted file mode 100644
index ea06856..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCWebServiceTester.java
+++ /dev/null
@@ -1,41 +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
- * -------- -------- -----------------------------------------------------------
- * 20060608 145529 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample;
-
-import java.util.Vector;
-
-import org.eclipse.wst.command.internal.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceTester;
-import org.eclipse.wst.ws.internal.wsrt.TestInfo;
-
-public class GSTCWebServiceTester implements IWebServiceTester {
-
- public ICommandFactory generate(TestInfo testInfo){
- Vector commands = new Vector();
- commands.add(new AddModuleDependenciesCommand(testInfo));
- commands.add(new GSTCGenerateCommand(testInfo));
- return new SimpleCommandFactory(commands);
- }
-
- public ICommandFactory launch(TestInfo testInfo){
- Vector commands = new Vector();
- if (testInfo.getRunTestClient()) {
- commands.add(new GSTCLaunchCommand(testInfo));
- }
- return new SimpleCommandFactory(commands);
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/PrivateUDDIRegistryTypeRegistry.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/PrivateUDDIRegistryTypeRegistry.java
deleted file mode 100644
index 8f00dc3..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/PrivateUDDIRegistryTypeRegistry.java
+++ /dev/null
@@ -1,59 +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.consumption.ui.wizard;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.ws.internal.ui.uddi.PrivateUDDIRegistryType;
-
-
-public class PrivateUDDIRegistryTypeRegistry
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- private static PrivateUDDIRegistryTypeRegistry instance_;
-
- private PrivateUDDIRegistryTypeRegistry() {
- }
-
- /**
- * Returns a singleton instance of this class.
- * @return A singleton WebServiceClientTypeRegistry object.
- */
- public static PrivateUDDIRegistryTypeRegistry getInstance() {
- if (instance_ == null) {
- instance_ = new PrivateUDDIRegistryTypeRegistry();
- }
-
- return instance_;
- }
-
- public PrivateUDDIRegistryType getPrivateUDDIRegistryType() {
- IExtensionRegistry reg = Platform.getExtensionRegistry();
- IConfigurationElement[] config = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption.ui",
- "privateUDDIRegistryType");
-
- try {
- Object configElement = ((config.length > 0) ? config[0].createExecutableExtension("class") : null);
- if(configElement != null && configElement instanceof PrivateUDDIRegistryType)
- return (PrivateUDDIRegistryType)configElement;
- else
- return null;
- }
- catch (CoreException e) {
- return null;
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/PublicUDDIRegistryTypeRegistry.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/PublicUDDIRegistryTypeRegistry.java
deleted file mode 100644
index e3f9426..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/PublicUDDIRegistryTypeRegistry.java
+++ /dev/null
@@ -1,96 +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.consumption.ui.wizard;
-
-import java.util.Vector;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryType;
-
-
-public class PublicUDDIRegistryTypeRegistry
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
- private static PublicUDDIRegistryTypeRegistry instance_;
- private Vector types_;
- private Vector configElements_;
-
- private PublicUDDIRegistryTypeRegistry() {
- types_ = new Vector();
- configElements_ = new Vector();
-
- init();
- }
-
- /**
- * Returns a singleton instance of this class.
- * @return A singleton WebServiceClientTypeRegistry object.
- */
- public static PublicUDDIRegistryTypeRegistry getInstance() {
- if (instance_ == null) {
- instance_ = new PublicUDDIRegistryTypeRegistry();
- }
-
- return instance_;
- }
-
- public void init() {
- IExtensionRegistry reg = Platform.getExtensionRegistry();
- IConfigurationElement[] config = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption.ui",
- "publicUDDIRegistryType");
-
- for (int i = 0; i < config.length; i++) {
- try {
- Object configElement = config[i].createExecutableExtension("class");
-
- if( configElement instanceof PublicUDDIRegistryType) {
- types_.add(configElement);
- configElements_.add(config[i]);
- }
- }
- catch (CoreException e) {}
- }
- }
-
- public PublicUDDIRegistryType[] getAllPublicUDDIRegistryTypes() {
- PublicUDDIRegistryType[] types = new PublicUDDIRegistryType[types_.size()];
- for (int i = 0; i < types_.size(); i++) {
- types[i] = (PublicUDDIRegistryType)types_.elementAt(i);
- }
- return types;
- }
-
- public PublicUDDIRegistryType getPublicUDDIRegistryTypeByID(String id) {
- for (int i = 0; i < configElements_.size(); i++) {
- IConfigurationElement c = (IConfigurationElement)configElements_.elementAt(i);
- if (c.getAttribute("id").equals(id))
- return (PublicUDDIRegistryType)types_.elementAt(i);
- }
- return null;
- }
-
- public String getPublicUDDIRegistryTypeIDByName(String name) {
- for (int i = 0; i < types_.size(); i++) {
- PublicUDDIRegistryType type = (PublicUDDIRegistryType)types_.elementAt(i);
- if (type.getName().equals(name))
- return ((IConfigurationElement)configElements_.elementAt(i)).getAttribute("id");
- }
- return null;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/RuntimeServerSelectionDialog.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/RuntimeServerSelectionDialog.java
deleted file mode 100644
index 6e2e016..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/RuntimeServerSelectionDialog.java
+++ /dev/null
@@ -1,707 +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
- * -------- -------- -----------------------------------------------------------
- * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060327 131605 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060717 150577 makandre@ca.ibm.com - Andrew Mak
- * 20060726 150865 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060726 150867 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060728 151723 mahutch@ca.ibm.com - Mark Hutchinson
- * 20060802 148731 mahutch@ca.ibm.com - Mark Hutchinson
- * 20071129 206080 zina@ca.ibm.com - Zina Mostafia Service Deployment Config Dialog group name truncated in NL Testing
- * 20071129 205583 zina@ca.ibm.com - Zina Mostafia Selected Server or Server Type is not highlighted in Service Dep.Config
- * 20080428 224726 pmoogk@ca.ibm.com - Peter Moogk
- * 20080527 234225 kathy@ca.ibm.com - Kathy Chan
- * 20090226 266063 zina@ca.ibm.com - Zina Mostafia Error message truncated in the Service Deployment configuration dialog
- * 20100526 300725 ericdp@ca.ibm.com - Eric D. Peters, Web service wizard Service Deployment Configuration view options corrupt each other
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.wizard;
-
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.RuntimeDescriptor;
-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.common.UIUtils;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.help.IWorkbenchHelpSystem;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.server.core.IRuntimeType;
-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.ui.ServerUICore;
-
-public class RuntimeServerSelectionDialog extends TitleAreaDialog {
-
- private Shell thisShell;
- private String messageBanner_;
- private Composite primaryGroup_;
- private Group runtimesGroup_;
- private Group serversGroup_;
- private Tree runtimesList_;
- private Tree serverList_;
- private Button viewSelectionByRuntimeButton_;
- private Button viewSelectionByServerButton_;
- private Button viewSelectionByExploreButton_;
- private ILabelProvider labelProvider_;
- private Image serverTypesIcon;
- private Image existingServersIcon;
-
- /*
- * CONTEXT_ID PWRS0001 for the selection of runtime, server and project combination
- */
- private String INFOPOP_PWRS_DIALOG = "PWRS0001";
- /* CONTEXT_ID PWRS0002 for the runtime selection on in the dailog */
- private String INFOPOP_PWRS_LIST_RUNTIMES = "PWRS0002";
- /* CONTEXT_ID PWRS0003 for the server selection in the dialog */
- private String INFOPOP_PWRS_LIST_SERVERS = "PWRS0003";
- /*
- * CONTEXT_ID PWRS0004 for the EJB Project combo box of the runtime selection dialog
- */
- // private String INFOPOP_PWRS_EJB_PROJECT = WebServiceConsumptionUIPlugin.ID
- // + ".PWRS0004";
- /*
- * CONTEXT_ID PWRS0005 for the runtime view radio button of the runtime selection dialog
- */
- private String INFOPOP_PWRS_RADIO_RUNTIME = "PWRS0005";
- /*
- * CONTEXT_ID PWRS0006 for the server view radio button of the runtime selection dialog
- */
- private String INFOPOP_PWRS_RADIO_SERVER = "PWRS0006";
- /*
- * CONTEXT_ID PWRS0007 for the explore view radio button of the runtime selection dialog
- */
- private String INFOPOP_PWRS_RADIO_EXPLORE = "PWRS0007";
- private Hashtable<String, String> serverLabels_;
- private Hashtable <String, IServer>existingServersTable_;
- private String defaultServer_;
- private String defaultRuntime_;
- private String typeId_;
-
- private RuntimeDescriptor selectedRuntime_;
-
- private IServer selectedServer_;
- private String selectedServerLabel_;
- private String selectedServerFactoryID_;
- private boolean isExistingServer_;
- private boolean validateOn_ = false;
- private byte selectionMode_;
- private final byte MODE_SERVICE = (byte) 0;
- private final String SERVER_TYPES_ICON = "icons/servers/servers_obj.gif";
- private final String EXISTING_SERVERS_ICON = "icons/servers/existing_server_obj.gif";
- private String serverInstanceID_;
-
- private boolean selectServerFirst_ = false;
-
- public RuntimeServerSelectionDialog(Shell shell, byte mode, TypeRuntimeServer ids, String j2eeVersion) {
- super(shell);
- messageBanner_ = ConsumptionUIMessages.PAGE_DESC_WS_RUNTIME_SELECTION;
- setShellStyle(SWT.CLOSE | SWT.TITLE | SWT.BORDER
- | SWT.APPLICATION_MODAL | SWT.RESIZE | getDefaultOrientation());
- selectionMode_ = mode;
- typeId_ = ids.getTypeId();
- defaultRuntime_ = ids.getRuntimeId();
- defaultServer_ = ids.getServerId();
- serverInstanceID_ = ids.getServerInstanceId();
- setIsExistingServer(ids.getServerInstanceId() != null);
- serverLabels_ = new Hashtable<String,String>();
- existingServersTable_ = new Hashtable<String, IServer>();
- labelProvider_ = ServerUICore.getLabelProvider();
- }
-
- public void setSelectServerFirst(boolean selectServerFirst) {
- selectServerFirst_ = selectServerFirst;
- }
-
- protected Point getInitialSize()
- {
- return this.getShell().computeSize(550, SWT.DEFAULT, true);
- }
-
- public TypeRuntimeServer getTypeRuntimeServer() {
- TypeRuntimeServer ids = new TypeRuntimeServer();
-
- ids.setTypeId(typeId_);
- if (selectedRuntime_ != null)
- ids.setRuntimeId(selectedRuntime_.getId());
-
- if( selectedServerFactoryID_ == null )
- {
- ids.setServerId( defaultServer_ );
- ids.setServerInstanceId( serverInstanceID_ );
- }
- else
- {
- ids.setServerId(selectedServerFactoryID_);
-
- if (isExistingServer_ && selectedServer_ != null)
- {
- ids.setServerInstanceId(selectedServer_.getId());
- }
- }
-
- return ids;
- }
-
- private boolean getIsExistingServer() {
- return isExistingServer_;
- }
-
- private void setIsExistingServer(boolean isExisting) {
- isExistingServer_ = isExisting;
- }
-
- protected Control createContents(Composite parent) {
- Composite comp = (Composite) super.createContents(parent);
- comp.pack();
-
- if (selectServerFirst_) {
- viewSelectionByServerButton_.setSelection(true);
- handleServerViewSelectionEvent();
- }
- else
- viewSelectionByRuntimeButton_.setSelection(true);
-
- return comp;
- }
-
- protected Control createDialogArea(Composite parent) {
- validateOn_ = false;
- thisShell = parent.getShell();
- if (thisShell == null) {
- thisShell = createShell();
- }
- Composite composite = (Composite) super.createDialogArea(parent);
- setMessage(messageBanner_);
- UIUtils uiUtils = new UIUtils(WebServiceConsumptionUIPlugin.ID);
- // Window title
- if (selectionMode_ == MODE_SERVICE) {
- thisShell.setText(ConsumptionUIMessages.PAGE_TITLE_WS_RUNTIME_SELECTION);
- setTitle(ConsumptionUIMessages.PAGE_TITLE_WS_RUNTIME_SELECTION);
- }
- else {
- thisShell.setText(ConsumptionUIMessages.PAGE_TITLE_WS_CLIENT_RUNTIME_SELECTION);
- setTitle(ConsumptionUIMessages.PAGE_TITLE_WS_CLIENT_RUNTIME_SELECTION);
- }
- IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
- helpSystem.setHelp(thisShell, WebServiceConsumptionUIPlugin.ID + "." + INFOPOP_PWRS_DIALOG);
-
- // -----------------------------------------------------------------------//
- new Label(composite, SWT.HORIZONTAL);
- // -----------------------------------------------------------------------//
- // Selection
- thisShell.setToolTipText(ConsumptionUIMessages.TOOLTIP_PWRS_PAGE);
-
- String groupName =(selectionMode_ == MODE_SERVICE) ? ConsumptionUIMessages.LABEL_SELECTION_VIEW_TITLE:
- ConsumptionUIMessages.LABEL_CLIENT_SELECTION_VIEW_TITLE;
- Group viewSelectionGroup_ = uiUtils.createGroup(composite, groupName, null, null);
-
- Composite viewSelectionComp_ = uiUtils.createComposite(viewSelectionGroup_, 1);
- viewSelectionByServerButton_ = uiUtils.createRadioButton(viewSelectionComp_, ConsumptionUIMessages.LABEL_SELECTION_VIEW_SERVER,
- ConsumptionUIMessages.TOOLTIP_PWRS_RADIO_SERVER, INFOPOP_PWRS_RADIO_SERVER);
- viewSelectionByServerButton_.addSelectionListener(new SelectionAdapter () {
- public void widgetSelected(SelectionEvent e) {
- if (!validateOn_) return;
- handleServerViewSelectionEvent();
- }
- });
-
- viewSelectionByRuntimeButton_ = uiUtils.createRadioButton(viewSelectionComp_, ConsumptionUIMessages.LABEL_SELECTION_VIEW_RUNTIME,
- ConsumptionUIMessages.TOOLTIP_PWRS_RADIO_RUNTIME, INFOPOP_PWRS_RADIO_RUNTIME);
- viewSelectionByRuntimeButton_.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- if (!validateOn_) return;
- handleRuntimeViewSelectionEvent();
- }
- });
-
- viewSelectionByExploreButton_ = uiUtils.createRadioButton(viewSelectionComp_, ConsumptionUIMessages.LABEL_SELECTION_VIEW_EXPLORE,
- ConsumptionUIMessages.TOOLTIP_PWRS_RADIO_EXPLORE, INFOPOP_PWRS_RADIO_EXPLORE);
- viewSelectionByExploreButton_.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- if (!validateOn_) return;
- handleExploreViewSelectionEvent();
- super.widgetSelected(e);
- }
- });
-
- primaryGroup_ = uiUtils.createComposite(composite, 1);
- runtimesGroup_ = uiUtils.createGroup( primaryGroup_, ConsumptionUIMessages.LABEL_RUNTIMES_LIST,
- ConsumptionUIMessages.TOOLTIP_PWRS_LIST_RUNTIMES, INFOPOP_PWRS_LIST_RUNTIMES);
- runtimesGroup_.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL));
- runtimesList_ = uiUtils.createTree(runtimesGroup_, ConsumptionUIMessages.TOOLTIP_PWRS_LIST_RUNTIMES,
- INFOPOP_PWRS_LIST_RUNTIMES, SWT.SINGLE | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
- runtimesList_.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- if (!validateOn_) return;
- TreeItem[] runtimeSel = runtimesList_.getSelection();
- processRuntimeListSelection(runtimeSel[0].getText());
- validateServerRuntimeSelection();
- }
- });
-
- // Server labels control
- serversGroup_ = uiUtils.createGroup(primaryGroup_, ConsumptionUIMessages.LABEL_SERVERS_LIST,
- ConsumptionUIMessages.TOOLTIP_PWRS_LIST_SERVERS, null);
- serversGroup_.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL));
- serverList_ = uiUtils.createTree(serversGroup_, ConsumptionUIMessages.TOOLTIP_PWRS_LIST_SERVERS, INFOPOP_PWRS_LIST_SERVERS,
- SWT.SINGLE | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
- serverList_.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL));
- serverList_.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- if (!validateOn_) return;
- processServerListSelection();
- validateServerRuntimeSelection();
- }
- });
-
- ServersList serverList = new ServersList();
- serverList.setServerTreeItems(serverList_);
-
- setRuntimesGroup();
- // -----------------------------------------------------------------------//
- new Label(composite, SWT.HORIZONTAL);
- validateOn_ = true;
- org.eclipse.jface.dialogs.Dialog.applyDialogFont(parent);
- return composite;
- }
-
- protected IStatus getStatus() {
- if (selectionMode_ == MODE_SERVICE) {
- if (selectedServerFactoryID_ != null && selectedRuntime_ != null)
- {
-
- if (WebServiceRuntimeExtensionUtils2.isServerRuntimeTypeSupported(selectedServerFactoryID_, selectedRuntime_.getId(),
- typeId_))
- {
- return Status.OK_STATUS;
- } else
- {
- String serverLabel = WebServiceRuntimeExtensionUtils2.getServerLabelById(selectedServerFactoryID_);
- String runtimeLabel = selectedRuntime_.getLabel();
- return StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_INVALID_SRT_SELECTIONS, new String[] { serverLabel,
- runtimeLabel }));
- }
- }
- }
- else {
-
- if (selectedServerFactoryID_ != null && selectedRuntime_ != null)
- {
- String clientId = typeId_;
- if (WebServiceRuntimeExtensionUtils2.isServerClientRuntimeTypeSupported(selectedServerFactoryID_, selectedRuntime_
- .getId(), clientId))
- {
- return Status.OK_STATUS;
- } else
- {
- String serverLabel = WebServiceRuntimeExtensionUtils2.getServerLabelById(selectedServerFactoryID_);
- String runtimeLabel = selectedRuntime_.getLabel();
- return StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_INVALID_SRT_SELECTIONS, new String[] { serverLabel,
- runtimeLabel }));
- }
- }
- }
- // Disable OK button if the runtime selection is invalid
- TreeItem[] runtimeSel = runtimesList_.getSelection();
- if (runtimeSel == null || runtimeSel.length <= 0 || runtimeSel[0].getText().length() == 0) {
- return StatusUtils.infoStatus(messageBanner_);
- }
- // Disable OK button if server selection is invalid
- TreeItem[] serverSel = serverList_.getSelection();
- String currentSelection = (serverSel != null && serverSel.length > 0) ? serverSel[0].getText() : "";
- if (serverSel == null || currentSelection.length() == 0) {
- return StatusUtils.infoStatus(messageBanner_);
- }
- if (!serverLabels_.containsKey(currentSelection) || !existingServersTable_.containsKey(currentSelection)) {
- return StatusUtils.infoStatus(messageBanner_);
- }
- // Disable OK button if category is selected rather than a server
- if (serverSel.length > 0 && serverSel[0].getItemCount()!=0) {
- return StatusUtils.infoStatus(messageBanner_);
- }
- else {
- return Status.OK_STATUS;
- }
-
- }
-
- public void validateServerRuntimeSelection() {
- IStatus status = getStatus();
- String message = new String(messageBanner_);
- message = new String(status.getMessage());
- if (status.getSeverity() == Status.ERROR) {
- setMessage(message,IMessageProvider.ERROR);
- getButton(IDialogConstants.OK_ID).setEnabled(false);
- }
- if (status.getSeverity() == Status.WARNING) {
- setMessage(message, IMessageProvider.WARNING);
- getButton(IDialogConstants.OK_ID).setEnabled(true);
- }
- if (status.getSeverity() == Status.INFO) {
- setMessage(message, IMessageProvider.INFORMATION);
- getButton(IDialogConstants.OK_ID).setEnabled(false);
- }
- if (status.getSeverity() == Status.OK) {
- setMessage(messageBanner_);
- getButton(IDialogConstants.OK_ID).setEnabled(true);
- }
- }
-
- private void handleRuntimeViewSelectionEvent() {
- GridLayout gl = new GridLayout();
- gl.numColumns = 1;
- gl.makeColumnsEqualWidth = true;
- GridData gd = new GridData(GridData.FILL_BOTH);
- primaryGroup_.setLayout(gl);
- primaryGroup_.setLayoutData(gd);
- runtimesGroup_.moveAbove(serversGroup_);
- primaryGroup_.layout();
-
- // TODO: Show all runtimes, and only servers supported by current type id
- }
-
- //
- // Called by handleEvent() when the user selects the layout to view
- //
- public void handleServerViewSelectionEvent() {
- GridLayout gl = new GridLayout();
- gl.numColumns = 1;
- gl.makeColumnsEqualWidth = true;
- GridData gd = new GridData(GridData.FILL_BOTH);
- primaryGroup_.setLayout(gl);
- primaryGroup_.setLayoutData(gd);
- serversGroup_.moveAbove(runtimesGroup_);
- primaryGroup_.layout();
-
- // TODO: Show all servers, and only runtimes supported by the current type id
- }
-
- //
- // Called by handleEvent() when the user selects the layout to view
- //
- private void handleExploreViewSelectionEvent() {
- GridLayout gl;
- gl = (GridLayout) primaryGroup_.getLayout();
- gl.numColumns = 2;
- gl.makeColumnsEqualWidth = true;
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.heightHint = 200;
- primaryGroup_.setLayout(gl);
- primaryGroup_.setLayoutData(gd);
- runtimesGroup_.moveAbove(serversGroup_);
- GridData gd2 = (GridData) runtimesGroup_.getLayoutData();
- gd2.heightHint = 200;
- primaryGroup_.layout();
-
- // TODO: Show all servers and runtimes from the type id
-
- }
-
- private void processRuntimeListSelection(String runtimeName) {
-
- if (selectionMode_ == MODE_SERVICE) {
- selectedRuntime_ = WebServiceRuntimeExtensionUtils2.getRuntimeByLabel(runtimeName);
- }
- else {
- selectedRuntime_ = WebServiceRuntimeExtensionUtils2.getRuntimeByLabel(runtimeName);
- }
- }
-
- private void processServerListSelection() {
- String currentSelection;
- TreeItem[] serverSel = serverList_.getSelection();
- if (serverSel != null && serverSel.length > 0) {
- currentSelection = serverSel[0].getText();
- if (serverLabels_.containsKey(currentSelection) || existingServersTable_.containsKey(currentSelection)) {
- if (existingServersTable_.containsKey(currentSelection)) {
- selectedServer_ = (IServer) existingServersTable_.get(currentSelection);
- selectedServerLabel_ = currentSelection;
- selectedServerFactoryID_ = selectedServer_.getServerType().getId();
- }
- else if (serverLabels_.containsKey(currentSelection)) {
- TreeItem parentItem = serverSel[0].getParentItem();
- if (parentItem != null && !parentItem.getText().equalsIgnoreCase(ConsumptionUIMessages.LABEL_TREE_EXISTING_SERVERS)) {
- selectedServerLabel_ = currentSelection;
- selectedServer_ = null;
- selectedServerFactoryID_ = (String) serverLabels_.get(currentSelection);
- }
- }
-
- // check if isExistingServer or new ServerType
- TreeItem parentItem = serverSel[0].getParentItem();
- if (parentItem != null && parentItem.getText().equalsIgnoreCase(ConsumptionUIMessages.LABEL_TREE_EXISTING_SERVERS)) {
- setIsExistingServer(true);
- }
- else {
- setIsExistingServer(false);
- }
- }
- else {
- selectedServer_ = null;
- selectedServerLabel_ = null;
- selectedServerFactoryID_ = null;
- setIsExistingServer(false);
- return;
- }
- }
- }
-
- // private static String getMessage(String key) {
- // return WebServiceConsumptionUIPlugin.getMessage(key);
- // }
-
- private void setRuntimesGroup() {
- runtimesList_.removeAll();
- String[] runtimes = null;
-
- if (selectionMode_ == MODE_SERVICE) {
- runtimes = WebServiceRuntimeExtensionUtils2.getRuntimesByServiceType(typeId_);
- }
- else {
- runtimes = WebServiceRuntimeExtensionUtils2.getRuntimesByClientType(typeId_);
- }
-
- //sort the runtimes based on the runtime name (bug 151723)
- Comparator<String> comparator = new RuntimeNameComparator();
- Arrays.sort(runtimes, comparator);
-
- TreeItem[] runtimeName = new TreeItem[runtimes.length];
-
- if (runtimes != null) {
- for (int i = 0; i < runtimes.length; i++) {
- String runtimeLabel = getRuntimeLabel(runtimes[i]);
- runtimeName[i] = new TreeItem(runtimesList_, SWT.NONE);
- runtimeName[i].setText(runtimeLabel);
-
- if (runtimes[i].equalsIgnoreCase(defaultRuntime_)) {
- runtimesList_.setSelection(new TreeItem[] { runtimeName[i]});
- selectedRuntime_ = getRuntime(runtimes[i]);
- }
- }
- }
- }
-
- private class RuntimeNameComparator implements Comparator <String>
- {
- public RuntimeNameComparator()
- {
- }
- //Compare to runtime ID strings by their labels. Used for sorting.
- public int compare(String item1, String item2) {
- try {
- String runtime1 = (String)item1;
- String runtime2 = (String)item2;
-
- return getRuntimeLabel(runtime1).compareToIgnoreCase(getRuntimeLabel(runtime2));
- }
- catch (Exception e)
- { //Just in case of class cast exception or NPE. should never happen
- }
- return 0;
- }
- }
-
- private String getRuntimeLabel(String type) {
- return getRuntime(type).getLabel();
- }
-
- private RuntimeDescriptor getRuntime(String type) {
- if (selectionMode_ == MODE_SERVICE) {
- return WebServiceRuntimeExtensionUtils2.getRuntimeById(type);
- }
- else {
- return WebServiceRuntimeExtensionUtils2.getRuntimeById(type);
- }
- }
-
- /**
- *
- * ServersList class
- *
- * Class which easily creates the Tree structure and entries for existing servers and server types
- */
- public class ServersList {
-
- private TreeItem[] existingServersTree;
- boolean existingServer = false;
-
- public void setServerTreeItems(Tree serversList) {
- this.setExistingServersTree(serversList);
- this.setServerTypesTree(serversList);
- }
-
- public void setExistingServersTree(Tree serverList) {
- String[] serverIds = this.getAllExistingServers();
- existingServersTree = new TreeItem[1];
- TreeItem[] existingServerItems = new TreeItem[serverIds.length];
- existingServersTree[0] = new TreeItem(serverList, SWT.NONE);
- existingServersTree[0].setText(ConsumptionUIMessages.LABEL_TREE_EXISTING_SERVERS);
- ImageDescriptor id = WebServiceConsumptionUIPlugin.getImageDescriptor(EXISTING_SERVERS_ICON);
- if (id != null) {
- existingServersIcon = id.createImage();
- existingServersTree[0].setImage(existingServersIcon);
- }
- for (int k = 0; k < serverIds.length; k++) {
- IServer server = (IServer) existingServersTable_.get(serverIds[k]);
- if (server != null) {
- IServerType serverType = server.getServerType();
- if (serverType != null) {
- String serverID = serverType.getId();
- existingServerItems[k] = new TreeItem(existingServersTree[0], SWT.NONE);
- existingServerItems[k].setText(serverIds[k]);
- if (serverID.equalsIgnoreCase(defaultServer_) && getIsExistingServer()) {
- existingServersTree[0].setExpanded(true);
- serverList.setSelection(new TreeItem[] { existingServerItems[k]});
- existingServer = true;
- RuntimeServerSelectionDialog.this.setIsExistingServer(true);
- selectedServer_ = server;
- selectedServerLabel_ = serverIds[k];
- selectedServerFactoryID_ = serverID;
- }
- existingServerItems[k].setImage(labelProvider_.getImage(serverType));
- }
- }
- }
- }
-
- public void setServerTypesTree(Tree serverList) {
-
- TreeItem[] serverTypesTree = new TreeItem[1];
- serverTypesTree[0] = new TreeItem(serverList, SWT.NONE);
- serverTypesTree[0].setText(ConsumptionUIMessages.LABEL_TREE_SERVER_TYPES);
- ImageDescriptor id = WebServiceConsumptionUIPlugin.getImageDescriptor(SERVER_TYPES_ICON);
- if (id != null) {
- serverTypesIcon = id.createImage();
- serverTypesTree[0].setImage(serverTypesIcon);
- }
- Hashtable <IServerType, IRuntimeType> categories_ = new Hashtable<IServerType, IRuntimeType>();
- Hashtable <IRuntimeType, TreeItem>categoryTreeItem = new Hashtable<IRuntimeType, TreeItem>();
- String[] serverIds = null;
- // rm String wst = wse.getWebServiceType();
- if (selectionMode_ == MODE_SERVICE) {
- serverIds = WebServiceRuntimeExtensionUtils2.getServerFactoryIdsByServiceType(typeId_);
- }
- else {
- serverIds = WebServiceRuntimeExtensionUtils2.getAllClientServerFactoryIds();
- }
- // rm serverId =
- // wssrtRegistry.getServerFactoryIdsByType(wse.getWebServiceType());
- if (serverIds == null) {
- serverIds = getAllServerTypes();
- }
- TreeItem[] parent = new TreeItem[serverIds.length];
- TreeItem[] item = new TreeItem[serverIds.length];
- if (serverIds != null) {
- for (int i = 0; i < serverIds.length; i++) {
- String server = ServerUtils.getInstance().getServerLabelForId(serverIds[i]);
- if (server != null) {
- RuntimeServerSelectionDialog.this.serverLabels_.put(server, serverIds[i]);
- IServerType serverType = ServerCore.findServerType(serverIds[i]);
- IRuntimeType runtimeType = serverType.getRuntimeType();
- if (!categories_.containsKey(serverType) && runtimeType != null) {
- categories_.put(serverType, runtimeType);
- if (categoryTreeItem.get(runtimeType) == null) {
- String categoryText = runtimeType.getName();
- Image categoryImage = labelProvider_.getImage(runtimeType);
- parent[i] = new TreeItem(serverTypesTree[0], SWT.NONE);
- parent[i].setText(categoryText);
- parent[i].setImage(categoryImage);
- categoryTreeItem.put(runtimeType, parent[i]);
- }
- else {
- parent[i] = (TreeItem) categoryTreeItem.get(runtimeType);
- }
- String factoryText = serverType.getName();
- Image factoryImage = labelProvider_.getImage(serverType);
- item[i] = new TreeItem(parent[i], SWT.NONE);
- item[i].setText(factoryText);
- item[i].setImage(factoryImage);
- item[i].setData(serverType);
- if (serverIds[i].equals(defaultServer_) && !existingServer) {
- serverList.setSelection(new TreeItem[] { item[i]});
- selectedServer_ = null;
- selectedServerLabel_ = factoryText;
- selectedServerFactoryID_ = (String) serverLabels_.get(selectedServerLabel_);
- }
- }
- }
- }
- }
-
- }
-
- /**
- * Get all servers in the workspace
- *
- * @return String[] of existing server names
- */
- private String[] getAllExistingServers() {
- Vector<String> serverIds = new Vector<String>();
- {
- IServer[] servers = ServerCore.getServers();
- if (servers != null && servers.length!=0) {
- for (int i = 0; i < servers.length; i++) {
- IServer server = (IServer) servers[i];
- serverIds.add(server.getName());
- existingServersTable_.put(server.getName(), server);
- }
- }
- }
- return (String[]) serverIds.toArray(new String[serverIds.size()]);
- }
-
- /**
- * Get all server types available for creation
- *
- * @return String[] of server names
- */
- private String[] getAllServerTypes() {
- Vector<String>serverTypes_ = new Vector<String>();
- IServerType[] defaultServersList = ServerCore.getServerTypes();
- for (int i = 0; i < defaultServersList.length; i++) {
- IServerType serverType = (IServerType) defaultServersList[i];
- serverTypes_.add(serverType.getId());
- }
- return (String[]) serverTypes_.toArray(new String[serverTypes_.size()]);
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionFilter2.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionFilter2.java
deleted file mode 100644
index c015190..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionFilter2.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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
- * -------- -------- -----------------------------------------------------------
- * 20060606 105045 mahutch@ca.ibm.com - Mark Hutchinson
- * 20070328 172339 kathy@ca.ibm.com - Kathy Chan
- * 20080501 229728 makandre@ca.ibm.com - Andrew Mak, uppercase .WSDL cannot be found by the Web Service Client wizard
- * 20080523 233764 makandre@ca.ibm.com - Andrew Mak, Top down EJB preference not respected
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wizard;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.webservice.wsdd.BeanLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceImpl;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-
-public class TypeSelectionFilter2
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- public String[] getWebServiceTypeByInitialSelection(IStructuredSelection initialSelection, ArrayList webServiceTypeList)
- {
-
- ArrayList supportedTypes = new ArrayList();
- if (initialSelection != null && initialSelection.size() == 1)
- {
-
- // Check for null initial selection
- Object initialObject = initialSelection.getFirstElement();
- if (initialObject == null)
- {
- return null;
- }
- // Match up resource type metadata with initial selection
- Iterator iter = webServiceTypeList.iterator();
- while (iter.hasNext())
- {
- String wst = (String)iter.next();
- String scenario = wst.substring(0,wst.indexOf("/"));
- String implId = wst.substring(wst.indexOf("/")+1);
- //IWebServiceType wst = (IWebServiceType)iter.next();
- //String typeId = (String)wst.getId();
- if (scenario.equals(String.valueOf(WebServiceScenario.BOTTOMUP)) && !supportedTypes.contains(wst))
- {
-
-
- WebServiceImpl wsimpl = WebServiceRuntimeExtensionUtils2.getWebServiceImplById(implId);
- String[] resourceTypes = wsimpl.getResourceTypeMetadata();
- for (int i=0; i<resourceTypes.length; i++)
- {
- if (resourceTypes[i]!=null)
- {
- if ((initialObject.getClass().getName()).endsWith(resourceTypes[i]))
- {
- String name = null;
- IResource resource = null;
-
- try
- {
- resource = ResourceUtils.getResourceFromSelection(initialObject);
- }
- catch( CoreException exc )
- {
- resource = null;
- }
-
- if (resource instanceof IContainer)
- {
- name = initialObject.getClass().getName();
- }
- else if( resource != null )
- {
- name = resource.getFullPath().toString();
- }
- else
- {
- name = initialObject.getClass().getName();
- }
- String[] extensions = wsimpl.getExtensionMetadata();
- if (acceptsName(name, extensions))
- {
- supportedTypes.add(wst);
- }
- }
-
- }
- }
-
- //TODO: Bug 179751 - Need to make checking for types recognized as bottom-up to be more extensible
-
- if (supportedTypes.isEmpty()) {
- if (initialObject instanceof BeanLink || initialObject instanceof ServiceImplBean || initialObject instanceof IType) {
- supportedTypes.add(wst);
- }
- }
- }
- }
-
- //If no wsImpls have accepted this selection, check if this is WSDL. If it is,
- //add the top-down Java service type to the list.
- if (supportedTypes.isEmpty())
- {
- String[] resourceTypes = {"File", "IResource", "String", "ServiceImpl", "ServiceRefImpl", "WSDLResourceImpl"};
- for (int i=0; i<resourceTypes.length; i++)
- {
- if (resourceTypes[i]!=null)
- {
- if ((initialObject.getClass().getName()).endsWith(resourceTypes[i]))
- {
- String name = null;
- IResource resource = null;
-
- try
- {
- resource = ResourceUtils.getResourceFromSelection(initialObject);
- }
- catch( CoreException exc )
- {
- resource = null;
- }
-
- if (resource instanceof IContainer)
- {
- name = initialObject.getClass().getName();
- }
- else if( resource != null )
- {
- name = resource.getFullPath().toString();
- }
- else if (initialObject instanceof String)
- { //the initialObject could be a path name that is a string
- //bug 105045
- name = (String)initialObject;
- }
- else
- {
- name = initialObject.getClass().getName();
- }
-
- String[] extensions = {".wsdl", ".wsil", ".html", ".ServiceImpl", ".ServiceRefImpl", ".WSDLResourceImpl"};
- if (acceptsName(name, extensions))
- {
- StringBuffer entrybuff = new StringBuffer();
- entrybuff.append(String.valueOf(WebServiceScenario.TOPDOWN));
- entrybuff.append("/");
-
- supportedTypes.add(entrybuff.toString() + "org.eclipse.jst.ws.wsImpl.java");
- supportedTypes.add(entrybuff.toString() + "org.eclipse.jst.ws.wsImpl.ejb");
- }
- }
-
- }
- }
- }
-
- }
-
-
-
- if (supportedTypes.isEmpty())
- {
- //It's not a registered implementation and its not WSDL so return null;
- return null;
- }
- else
- {
- return (String[])supportedTypes.toArray(new String[0]);
- }
- }
- //
- // Checks if the given name is acceptable based upon its extension
- //
- private boolean acceptsName ( String name, String[] extensions)
- {
- //Return true if "all" extensions are supported.
-
- if (extensions[0]!=null)
- {
- if (extensions[0].equals("all"))
- {
- return true;
- }
- }
-
- for (int i=0; i<extensions.length; i++)
- {
- if (extensions[i]!=null)
- {
- if (name.toLowerCase().endsWith(extensions[i].toLowerCase()))
- return true;
- }
- }
- return false;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionMetadata.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionMetadata.java
deleted file mode 100644
index 8275acc..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionMetadata.java
+++ /dev/null
@@ -1,84 +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 127138 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wizard;
-
-import com.ibm.icu.util.StringTokenizer;
-
-
- //
- // This class holds the set of distinguishing factors in determining
- // the default Web service type. The default Web Service type will be determined
- // by pattern matching the initial selection with the supported extension
- // and the resource type metadata specified in the manifest file.
- //
- public class TypeSelectionMetadata
- {
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- public String[] extensionMeta;
- public String[] resourceTypeMeta;
-
- public TypeSelectionMetadata(String extensionMD, String resourceTypeMD)
- {
- setExtensionMetadata(extensionMD);
- setResourceTypeMetadata(resourceTypeMD);
- }
-
- public void setExtensionMetadata(String extensionMetadata)
- {
- StringTokenizer st = new StringTokenizer(extensionMetadata);
- extensionMeta = new String[st.countTokens()];
- int i=0;
- while (st.hasMoreElements())
- {
- String exten = (String)st.nextToken();
- if (exten!=null)
- {
- extensionMeta[i]=exten;
- }
- i++;
- }
-
- }
-
- public String[] getExtensionMetadata()
- {
- return extensionMeta;
- }
-
- public void setResourceTypeMetadata(String resourceTypeMetadata)
- {
- StringTokenizer st = new StringTokenizer(resourceTypeMetadata);
- resourceTypeMeta = new String[st.countTokens()];
- int i=0;
- while (st.hasMoreElements())
- {
- String resourceType = (String)st.nextToken();
- if (resourceType!=null)
- {
- resourceTypeMeta[i]=resourceType;
- }
- i++;
- }
- }
-
- public String[] getResourceTypeMetadata()
- {
- return resourceTypeMeta;
- }
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceInfo.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceInfo.java
deleted file mode 100644
index 64bc552..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceInfo.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wizard;
-
-
-/**
-* This type is used to hold user or calculated
-* data to be use by finsih tasks
-*/
-public interface WebServiceInfo
-{
-
-}
-
-
-
-
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryNTTComm.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryNTTComm.java
deleted file mode 100644
index b93efbb..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryNTTComm.java
+++ /dev/null
@@ -1,41 +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.consumption.ui.wizard.uddi;
-
-import org.eclipse.wst.ws.parser.PluginMessages;
-
-public class PublicUDDIRegistryNTTComm implements PublicUDDIRegistryType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
- public PublicUDDIRegistryNTTComm() {
- }
-
- public String getName() {
- return PluginMessages.PUBLICUDDIREGISTRYTYPE_NAME_NTTCOMM;
- }
-
- public String getInquiryURL() {
- return "http://www.uddi.ne.jp/ubr/inquiryapi";
- }
-
- public String getPublishURL() {
- return "https://www.uddi.ne.jp/ubr/publishapi";
- }
-
- public String getRegistrationURL() {
- return "http://www.ntt.com/uddi/";
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistrySAP.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistrySAP.java
deleted file mode 100644
index c72f4fa..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistrySAP.java
+++ /dev/null
@@ -1,41 +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.consumption.ui.wizard.uddi;
-
-import org.eclipse.wst.ws.parser.PluginMessages;
-
-public class PublicUDDIRegistrySAP implements PublicUDDIRegistryType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
- public PublicUDDIRegistrySAP() {
- }
-
- public String getName() {
- return PluginMessages.PUBLICUDDIREGISTRYTYPE_NAME_SAP;
- }
-
- public String getInquiryURL() {
- return "http://uddi.sap.com/UDDI/api/inquiry/";
- }
-
- public String getPublishURL() {
- return "https://uddi.sap.com/UDDI/api/publish/";
- }
-
- public String getRegistrationURL() {
- return "http://uddi.sap.com/";
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistrySAPTest.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistrySAPTest.java
deleted file mode 100644
index 86267d6..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistrySAPTest.java
+++ /dev/null
@@ -1,41 +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.consumption.ui.wizard.uddi;
-
-import org.eclipse.wst.ws.parser.PluginMessages;
-
-public class PublicUDDIRegistrySAPTest implements PublicUDDIRegistryType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
- public PublicUDDIRegistrySAPTest() {
- }
-
- public String getName() {
- return PluginMessages.PUBLICUDDIREGISTRYTYPE_NAME_SAP_TEST;
- }
-
- public String getInquiryURL() {
- return "http://udditest.sap.com/UDDI/api/inquiry/";
- }
-
- public String getPublishURL() {
- return "https://udditest.sap.com/UDDI/api/publish/";
- }
-
- public String getRegistrationURL() {
- return "http://udditest.sap.com/";
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryType.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryType.java
deleted file mode 100644
index e4d9e65..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryType.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 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.consumption.ui.wizard.uddi;
-
-public interface PublicUDDIRegistryType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
- public String getName();
- public String getInquiryURL();
- public String getPublishURL();
- public String getRegistrationURL();
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryXMethods.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryXMethods.java
deleted file mode 100644
index 93bacf1..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryXMethods.java
+++ /dev/null
@@ -1,43 +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.consumption.ui.wizard.uddi;
-
-import org.eclipse.wst.ws.parser.PluginMessages;
-
-public class PublicUDDIRegistryXMethods implements PublicUDDIRegistryType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
- public PublicUDDIRegistryXMethods() {
- }
-
- public String getName() {
- return PluginMessages.PUBLICUDDIREGISTRYTYPE_NAME_XMETHODS;
- }
-
- public String getInquiryURL() {
- //return "http://uddi.xmethods.net/inquire";
- return "http://uddi.xmethods.net/inquire2";
- }
-
- // Read-only registry. The publish and registration URLs don't exist.
- public String getPublishURL() {
- return "https://uddi.xmethods.net/publish2";
- }
-
- public String getRegistrationURL() {
- return "http://www.xmethods.net/ve2/Register.po?event=registerOrg";
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/AddWSDLToWSILWrapperCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/AddWSDLToWSILWrapperCommand.java
deleted file mode 100644
index ea57878..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/AddWSDLToWSILWrapperCommand.java
+++ /dev/null
@@ -1,65 +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.consumption.ui.wsil;
-
-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.ui.PlatformUI;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsil.AddWSDLToWSILCommand;
-
-
-
-public class AddWSDLToWSILWrapperCommand extends AbstractDataModelOperation
-{
- private AddWSDLToWSILCommand command;
- private Arguments args;
-
- public AddWSDLToWSILWrapperCommand()
- {
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
-
- if (command == null)
- command = new AddWSDLToWSILCommand();
- if (!args.isEmpty())
- {
- command.setArguments(args.getStringArguments());
- command.setWWWAuthenticationHandler(new DialogWWWAuthentication(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell()));
- command.setEnvironment( env );
- return command.execute( null, null);
- }
- return Status.OK_STATUS;
- }
- /**
- * @param args The args to set.
- */
- public void setArgs(Arguments args)
- {
- this.args = args;
- }
-
- /**
- * @param command The command to set.
- */
- public void setCommand(AddWSDLToWSILCommand command)
- {
- this.command = command;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/Arguments.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/Arguments.java
deleted file mode 100644
index 7a177c5..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/Arguments.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wsil;
-
-import java.util.Vector;
-
-public class Arguments
-{
- private Vector args_;
-
- public Arguments()
- {
- args_ = new Vector();
- }
-
- public void add(String key, Object value)
- {
- args_.add(key);
- if (value != null)
- args_.add(value);
- }
-
- public void remove(String key)
- {
- int index = args_.indexOf(key);
- if (index >= 0)
- {
- args_.remove(index);
- args_.remove(index+1);
- }
- }
-
- public Object get(String key)
- {
- int index = args_.indexOf(key);
- if (index >= 0)
- return args_.get(index+1);
- else
- return null;
- }
-
- public void clear()
- {
- args_.clear();
- }
-
- public Object[] getArguments()
- {
- Object[] args = new Object[args_.size()];
- args_.copyInto(args);
- return args;
- }
-
- public String[] getStringArguments()
- {
- String[] args = new String[args_.size()];
- for (int i = 0; i < args.length; i++)
- args[i] = args_.get(i).toString();
- return args;
- }
-
- public boolean isEmpty()
- {
- return args_.isEmpty();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/DialogWWWAuthentication.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/DialogWWWAuthentication.java
deleted file mode 100644
index 100750c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/DialogWWWAuthentication.java
+++ /dev/null
@@ -1,153 +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.consumption.ui.wsil;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.ws.internal.parser.wsil.WWWAuthenticationException;
-import org.eclipse.wst.ws.internal.parser.wsil.WWWAuthenticationHandler;
-
-
-public class DialogWWWAuthentication extends Dialog implements WWWAuthenticationHandler
-{
-
- /*CONTEXT_ID DBAS0001 for the HTTP basic authentication user name*/
- private final String INFOPOP_DBAS_USERNAME = WebServiceConsumptionUIPlugin.ID + ".DBAS0001";
-
- /*CONTEXT_ID DBAS0002 for the HTTP basic authentication password*/
- private final String INFOPOP_DBAS_PASSWORD = WebServiceConsumptionUIPlugin.ID + ".DBAS0002";
-
- private String usernameString_;
- private String passwordString_;
-
- private Text username_;
- private Text password_;
-
- private WWWAuthenticationException wwwae_;
-
- public DialogWWWAuthentication(Shell shell)
- {
- super(shell);
- usernameString_ = null;
- passwordString_ = null;
- wwwae_ = null;
- }
-
- /**
- * Called when the Cancel button is pressed.
- */
- protected void cancelPressed()
- {
- usernameString_ = null;
- passwordString_ = null;
- super.cancelPressed();
- }
-
- /**
- * Called when the OK button is pressed.
- */
- protected void okPressed()
- {
- String usernameString = username_.getText();
- usernameString_ = (usernameString.length() > 0) ? usernameString : null;
- String passwordString = password_.getText();
- passwordString_ = (passwordString.length() > 0) ? passwordString : null;
- setReturnCode(Dialog.OK);
- super.okPressed();
- }
-
- /**
- * See {@link org.eclipse.jface.window.Window#configureShell}.
- * @param shell The shell.
- */
- protected void configureShell(Shell shell)
- {
- super.configureShell(shell);
- shell.setText(ConsumptionUIMessages.DIALOG_TITLE_HTTP_BASIC_AUTH);
- }
-
- /**
- * Creates the dialog area.
- * @param parent The parent composite.
- * @return The control area.
- */
- protected Control createDialogArea(Composite parent)
- {
- Composite composite = (Composite)super.createDialogArea(parent);
- GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_VERTICAL);
- gd.widthHint = 400;
- gd.grabExcessVerticalSpace = true;
- gd.grabExcessHorizontalSpace = true;
- composite.setLayoutData(gd);
- GridLayout gl = new GridLayout();
- gl.numColumns = 2;
- gl.verticalSpacing = 15;
- composite.setLayout(gl);
-
- Label label = new Label(composite, SWT.WRAP);
- label.setText(ConsumptionUIMessages.LABEL_URL);
- label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
- label = new Label(composite, SWT.WRAP);
- label.setText(wwwae_.getURL());
- label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- label = new Label(composite, SWT.WRAP);
- label.setText(ConsumptionUIMessages.LABEL_HTTP_BASIC_AUTH_USERNAME);
- label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
- username_ = new Text(composite, SWT.BORDER);
- username_.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- username_.setToolTipText(ConsumptionUIMessages.TOOLTIP_HTTP_BASIC_AUTH_USERNAME);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(username_, INFOPOP_DBAS_USERNAME);
-
- label = new Label(composite, SWT.WRAP);
- label.setText(ConsumptionUIMessages.LABEL_HTTP_BASIC_AUTH_PASSWORD);
- label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
- password_ = new Text(composite, SWT.BORDER);
- password_.setEchoChar('*');
- password_.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- password_.setToolTipText(ConsumptionUIMessages.TOOLTIP_HTTP_BASIC_AUTH_PASSWORD);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(username_, INFOPOP_DBAS_PASSWORD);
-
- return composite;
- }
-
- public void handleWWWAuthentication(WWWAuthenticationException wwwae)
- {
- usernameString_ = null;
- passwordString_ = null;
- wwwae_ = wwwae;
- open();
- }
-
- public String getUsername()
- {
- return usernameString_;
- }
-
- public String getPassword()
- {
- return passwordString_;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/TableViewerEditor.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/TableViewerEditor.java
deleted file mode 100644
index 38a45fc..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/TableViewerEditor.java
+++ /dev/null
@@ -1,525 +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.consumption.ui.wsil;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.TableEditor;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.events.TraverseEvent;
-import org.eclipse.swt.events.TraverseListener;
-import org.eclipse.swt.graphics.Image;
-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.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-
-
-public class TableViewerEditor extends Composite
-{
- private int DEFAULT_TABLE_HEIGHT_HINT = 100;
- private int DEFAULT_COLUMN_WIDTH = 80;
-
- private String[] columns_;
- private TableViewer tableViewer_;
- private Table table_;
- private TableEditor editor_;
- private TableEditorListener tableEditorListener_;
- private Text text_;
- private Button add_;
- private Button remove_;
-
- private List values_;
- private Object defaultValue_;
-
- public TableViewerEditor(Composite parent, String[] columns, List initValues, Object defaultValue)
- {
- super(parent, SWT.NONE);
- columns_ = columns;
- values_ = new ArrayList();
- if (initValues != null && initValues.size() > 0)
- values_.addAll(initValues);
- defaultValue_ = (defaultValue != null) ? defaultValue : new String("");
- createPartControl(this);
- }
-
- private void createPartControl(Composite parent)
- {
- GridLayout gl = new GridLayout();
- gl.marginHeight = 0;
- gl.marginWidth = 0;
- setLayout(gl);
- setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- Composite composite = new Composite(parent, SWT.NONE);
- gl = new GridLayout();
- gl.marginHeight = 0;
- gl.marginWidth = 0;
- composite.setLayout(gl);
- composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- table_ = new Table(composite, SWT.SINGLE | SWT.FULL_SELECTION | SWT.BORDER);
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.heightHint = DEFAULT_TABLE_HEIGHT_HINT;
- table_.setLayoutData(gd);
- table_.setHeaderVisible(true);
- table_.setLinesVisible(true);
- TableLayout tableLayout = new TableLayout();
- int maxWidth = DEFAULT_COLUMN_WIDTH;
- for (int i = 0; i < columns_.length; i++)
- {
- TableColumn tableColumn = new TableColumn(table_, SWT.NONE);
- tableColumn.setText(columns_[i]);
- tableColumn.pack();
- int tableColumnWidth = Math.max(DEFAULT_COLUMN_WIDTH, tableColumn.getWidth());
- maxWidth = Math.max(maxWidth, tableColumnWidth);
- ColumnWeightData columnData = new ColumnWeightData(tableColumnWidth, tableColumnWidth, true);
- tableLayout.addColumnData(columnData);
- }
- table_.setLayout(tableLayout);
- // initialize the table editor
- editor_ = new TableEditor(table_);
- // The editor must have the same size as the cell and must
- // not be any smaller than 50 pixels.
- editor_.horizontalAlignment = SWT.LEFT;
- editor_.grabHorizontal = true;
- editor_.minimumWidth = maxWidth;
- tableEditorListener_ = new TableEditorListener();
- table_.addMouseListener(tableEditorListener_);
- tableViewer_ = new TableViewer(table_);
- tableViewer_.getControl().addKeyListener(
- new KeyListener()
- {
- public void keyPressed(KeyEvent e)
- {
- // Del
- if (((int)e.character) == 127)
- handleDeleteKeyPressed();
- // Enter or space
- if (((int)e.character) == 13 || ((int)e.character) == 32)
- tableEditorListener_.editSelection();
- }
- public void keyReleased(KeyEvent e)
- {
- }
- }
- );
- tableViewer_.setContentProvider(new ListContentProvider());
- tableViewer_.setLabelProvider(new ListLabelProvider());
- tableViewer_.setInput(values_);
- tableViewer_.addSelectionChangedListener(
- new ISelectionChangedListener()
- {
- public void selectionChanged(SelectionChangedEvent event)
- {
- enableRemove(true);
- }
- }
- );
-
- Composite buttonComposite = new Composite(composite, SWT.NONE);
- gl = new GridLayout();
- gl.numColumns = 2;
- gl.makeColumnsEqualWidth = true;
- buttonComposite.setLayout(gl);
- buttonComposite.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_BEGINNING));
-
- add_ = new Button(buttonComposite, SWT.PUSH);
- add_.setText(ConsumptionUIMessages.LABEL_ADD);
- add_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- add_.addSelectionListener(
- new SelectionListener()
- {
- public void widgetSelected(SelectionEvent event)
- {
- handleAddButtonSelected(event);
- }
- public void widgetDefaultSelected(SelectionEvent event)
- {
- }
- }
- );
-
- remove_ = new Button(buttonComposite, SWT.PUSH);
- remove_.setText(ConsumptionUIMessages.LABEL_REMOVE);
- remove_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- remove_.addSelectionListener(
- new SelectionListener()
- {
- public void widgetSelected(SelectionEvent event)
- {
- handleRemoveButtonSelected(event);
- }
- public void widgetDefaultSelected(SelectionEvent event)
- {
- }
- }
- );
- enableRemove(false);
- }
-
- private void enableRemove(boolean enabled)
- {
- remove_.setEnabled(enabled && !tableViewer_.getSelection().isEmpty());
- }
-
- private void handleAddButtonSelected(SelectionEvent event)
- {
- values_.add(defaultValue_);
- refresh();
- setSelectionAsObject(values_.get(table_.getItemCount()-1));
- tableEditorListener_.editSelection();
- }
-
- private void handleRemoveButtonSelected(SelectionEvent event)
- {
- handleDeleteKeyPressed();
- }
-
- private void handleDeleteKeyPressed()
- {
- internalDispose();
- ISelection selection = tableViewer_.getSelection();
- if (selection != null && !selection.isEmpty() && (selection instanceof IStructuredSelection))
- {
- int selectionIndex = table_.getSelectionIndex();
- int selectionCount = table_.getItemCount();
- values_.remove(selectionIndex);
- if (selectionIndex < selectionCount-1)
- setSelectionAsObject(values_.get(selectionIndex));
- else if (selectionCount -2 >= 0)
- setSelectionAsObject(values_.get(selectionCount-2));
- refresh();
- }
- }
-
- private void internalRefresh()
- {
- // synchronize text field, previously selected table cell and model (inputObject)
- if (text_ != null)
- {
- TableItem oldTableItem = editor_.getItem();
- int oldColumnIndex = editor_.getColumn();
- if (oldTableItem != null && oldColumnIndex >= 0 && oldColumnIndex < columns_.length)
- {
- String oldText = text_.getText();
- oldTableItem.setText(oldColumnIndex, oldText);
- int oldRowIndex = table_.indexOf(oldTableItem);
- values_.set(oldRowIndex, oldText);
- }
- }
- }
-
- private void setSelectionAsObject(Object object)
- {
- tableViewer_.setSelection(new StructuredSelection(object), true);
- }
-
- public void setToolTipText(String string)
- {
- table_.setToolTipText(string);
- }
-
- public void setInfopop(String string)
- {
- PlatformUI.getWorkbench().getHelpSystem().setHelp(table_, string);
- }
-
- public void setInput(List list)
- {
- values_.clear();
- values_.addAll(list);
- }
-
- public void refresh()
- {
- internalRefresh();
- tableViewer_.refresh();
- }
-
- public TableItem[] getItems()
- {
- internalRefresh();
- return table_.getItems();
- }
-
- public void setEnabled(boolean enabled)
- {
- super.setEnabled(enabled);
- add_.setEnabled(enabled);
- enableRemove(enabled);
- }
-
- public void dispose()
- {
- super.dispose();
- internalDispose();
- if (editor_ != null)
- editor_.dispose();
- if (table_ != null)
- table_.dispose();
- if (add_ != null)
- add_.dispose();
- if (remove_ != null)
- remove_.dispose();
- }
-
- private void internalDispose()
- {
- if (text_ != null)
- text_.dispose();
- text_ = null;
- }
-
- protected class TableEditorListener implements MouseListener
- {
- private int currSelectionIndex_;
- private int editRow_;
- private int editColumn_;
-
- public TableEditorListener()
- {
- super();
- currSelectionIndex_ = -1;
- editRow_ = -1;
- editColumn_ = -1;
- }
-
- public void mouseDoubleClick(MouseEvent e)
- {
- mouseDown(e);
- }
-
- public void mouseDown(MouseEvent e)
- {
- // refresh table
- internalRefresh();
- // Clean up previous text editor control
- internalDispose();
- // update table
- if (table_.isFocusControl())
- {
- int selectedRowIndex = getSelectedRow(table_, e.y);
- if (currSelectionIndex_ != -1 && selectedRowIndex != -1 && currSelectionIndex_ == selectedRowIndex)
- {
- TableItem tableItem = table_.getItem(selectedRowIndex);
- int selectedColumnIndex = getSelectedColumn(tableItem, e.x, e.y);
- if (selectedColumnIndex != -1 && (text_ == null || text_.isDisposed() || selectedColumnIndex != editor_.getColumn()))
- editSelection(selectedRowIndex, selectedColumnIndex);
- }
- currSelectionIndex_ = selectedRowIndex;
- }
- }
-
- public void mouseUp(MouseEvent e)
- {
- }
-
- private int getSelectedRow(Table table, int y)
- {
- TableItem[] tableItems = table.getItems();
- for (int i = 0; i < tableItems.length; i++)
- {
- Rectangle rectangle = tableItems[i].getBounds(0);
- if (rectangle != null && y >= rectangle.y && y < (rectangle.y + rectangle.height))
- return i;
- }
- return -1;
- }
-
- private int getSelectedColumn(TableItem tableItem, int x, int y)
- {
- for (int i = 0; i < columns_.length; i++)
- {
- if (tableItem.getBounds(i).contains(x, y))
- return i;
- }
- return -1;
- }
-
- private void editSelection(int row, int column)
- {
- editRow_ = row;
- editColumn_ = column;
- TableItem tableItem = table_.getItem(row);
- // Setup adapter for the new selection
- text_ = new Text(table_, SWT.NONE);
- String text = tableItem.getText(column);
- text_.setText((text != null) ? text : "");
- text_.addKeyListener(new KeyListener()
- {
- public void keyPressed(KeyEvent e)
- {
- // Esc
- if (((int)e.character) == 27)
- cancelSelection();
- }
- public void keyReleased(KeyEvent e)
- {
- }
- }
- );
- text_.addTraverseListener(new TraverseListener()
- {
- public void keyTraversed(TraverseEvent e)
- {
- if (e.detail == SWT.TRAVERSE_TAB_NEXT)
- traverseTabNext();
- else if (e.detail == SWT.TRAVERSE_TAB_PREVIOUS)
- traverseTabPrevious();
- }
- }
- );
- editor_.setEditor(text_, tableItem, column);
- text_.setFocus();
- text_.selectAll();
- }
-
- protected void traverseTabNext()
- {
- internalRefresh();
- internalDispose();
- if (!(editRow_ == table_.getItems().length-1 && editColumn_ == columns_.length-1))
- {
- if (editColumn_ < columns_.length-1)
- editColumn_++;
- else
- {
- editColumn_ = 0;
- editRow_++;
- table_.select(editRow_);
- }
- editSelection(editRow_, editColumn_);
- }
- }
-
- protected void traverseTabPrevious()
- {
- internalRefresh();
- internalDispose();
- if (!(editRow_ == 0 && editColumn_ == 0))
- {
- if (editColumn_ > 0)
- editColumn_--;
- else
- {
- editColumn_ = columns_.length-1;
- editRow_--;
- table_.select(editRow_);
- }
- editSelection(editRow_, editColumn_);
- }
- }
-
- public void cancelSelection()
- {
- internalDispose();
- internalRefresh();
- }
-
- public void editSelection()
- {
- int selectedRowIndex = table_.getSelectionIndex();
- if (selectedRowIndex != -1 && columns_.length > 0)
- {
- // refresh table
- internalRefresh();
- // Clean up any previous editor control
- internalDispose();
- editSelection(selectedRowIndex, 0);
- }
- currSelectionIndex_ = selectedRowIndex;
- }
- }
-
- protected class ListContentProvider implements IStructuredContentProvider
- {
- public void dispose()
- {
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
- {
- tableViewer_.add(getElements(newInput));
- }
-
- public Object[] getElements(Object inputElement)
- {
- if (inputElement instanceof List)
- {
- List list = (List)inputElement;
- Object[] objects = new Object[list.size()];
- for (int i = 0; i < objects.length; i++)
- objects[i] = list.get(i);
- return objects;
- }
- else
- return new Object[0];
- }
- }
-
- protected class ListLabelProvider implements ITableLabelProvider
- {
- public Image getColumnImage(Object element, int columnIndex)
- {
- return null;
- }
-
- public String getColumnText(Object element, int columnIndex)
- {
- return element.toString();
- }
-
- public void addListener(ILabelProviderListener listener)
- {
- }
-
- public void removeListener(ILabelProviderListener listener)
- {
- }
-
- public boolean isLabelProperty(Object element, String property)
- {
- return true;
- }
-
- public void dispose()
- {
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/Utils.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/Utils.java
deleted file mode 100644
index f2b49ee..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/Utils.java
+++ /dev/null
@@ -1,52 +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.consumption.ui.wsil;
-
-import java.net.MalformedURLException;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-
-
-public class Utils
-{
- public Utils()
- {
- }
-
- public String toFileSystemURI(String relativePlatformURI)
- {
- if (relativePlatformURI != null)
- return toFileSystemURI(ResourceUtils.findResource(relativePlatformURI));
- else
- return null;
- }
-
- public String toFileSystemURI(IResource res)
- {
- if (res != null)
- {
- IPath path = res.getLocation();
- if (path != null)
- {
- try
- {
- return path.toFile().toURL().toString();
- }
- catch (MalformedURLException murle)
- {
- }
- }
- }
- return null;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ClientRuntimeDescriptor.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ClientRuntimeDescriptor.java
deleted file mode 100644
index 1163198..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ClientRuntimeDescriptor.java
+++ /dev/null
@@ -1,223 +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
- * -------- -------- -----------------------------------------------------------
- * 20071107 203826 kathy@ca.ibm.com - Kathy Chan
- * 20071130 203826 kathy@ca.ibm.com - Kathy Chan
- * 20080326 221364 kathy@ca.ibm.com - Kathy Chan
- * 20100811 322429 mahutch@ca.ibm.com - Mark Hutchinson, Improve performance of launching the Web Services Wizard
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wsrt;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion;
-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;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntime;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntimeChecker;
-
-public class ClientRuntimeDescriptor
-{
- private IConfigurationElement elem;
- private Hashtable allWebServiceClientImpls;
- private Hashtable allRuntimes;
- private String id;
- private WebServiceClientImpl clientImplementationType;
- private RuntimeDescriptor runtime;
- private String clientRuntimeClassName;
- private IWebServiceRuntime webServiceRuntime;
- private RequiredFacetVersion[] requiredFacetVersions;
- private Set projectFacetVersions;
- private IWebServiceRuntimeChecker webServiceRuntimeChecker;
- private String runtimePreferredServerType;
- private Set<String> suitableProjectTemplates;
- private Set<String> unsuitableProjectTemplates;
-
- public ClientRuntimeDescriptor(IConfigurationElement elem, Hashtable allWebServiceClientImpls, Hashtable allRuntimes)
- {
- this.elem = elem;
- this.allWebServiceClientImpls = allWebServiceClientImpls;
- this.allRuntimes = allRuntimes;
- }
-
- public WebServiceClientImpl getClientImplementationType()
- {
- if (clientImplementationType == null)
- {
- String clientImplementationTypeId = elem.getAttribute("clientImplementationTypeId");
- clientImplementationType = (WebServiceClientImpl)allWebServiceClientImpls.get(clientImplementationTypeId);
- }
- return clientImplementationType;
- }
-
- public String getClientRuntimeClassName()
- {
- if (clientRuntimeClassName == null)
- {
- clientRuntimeClassName = elem.getAttribute("class");
- }
- return clientRuntimeClassName;
- }
-
- public String getId()
- {
- if (id == null)
- {
- id = elem.getAttribute("id");
- }
- return id;
- }
-
- public void processClientRuntimeProperties(IConfigurationElement elem) {
- if (suitableProjectTemplates == null) {
- suitableProjectTemplates = new HashSet<String>(5);
- }
- if (unsuitableProjectTemplates == null) {
- unsuitableProjectTemplates = new HashSet<String>(5);
- }
- IConfigurationElement[] elements = elem.getChildren("suitable-project-template");
- for (IConfigurationElement configElement : elements) {
- String templateId = configElement.getAttribute("id");
- if (templateId != null)
- suitableProjectTemplates.add(templateId);
- }
- elements = elem.getChildren("unsuitable-project-template");
- for (IConfigurationElement configElement : elements) {
- String templateId = configElement.getAttribute("id");
- if (templateId != null)
- unsuitableProjectTemplates.add(templateId);
- }
- }
-
- //this will return an empty list if no valid suitable-project-template elements found
- public Set<String> getSuitableProjectTemplates() {
- if (suitableProjectTemplates == null) {
- suitableProjectTemplates = new HashSet<String>(5);
- }
- return suitableProjectTemplates;
- }
-
- //this will return an empty list if no valid unsuitable-project-template elements found
- public Set<String> getUnsuitableProjectTemplates() {
- if (unsuitableProjectTemplates == null) {
- unsuitableProjectTemplates = new HashSet<String>(5);
- }
- return unsuitableProjectTemplates;
- }
-
- public RequiredFacetVersion[] getRequiredFacetVersions()
- {
- if (requiredFacetVersions == null)
- {
- ArrayList requiredFacetVersionList = new ArrayList();
- IConfigurationElement[] facetElems = elem.getChildren("required-facet-version");
- for (int i = 0; i < facetElems.length; i++)
- {
- RequiredFacetVersion rfv = new RequiredFacetVersion();
- IProjectFacet projectFacet = ProjectFacetsManager.getProjectFacet(facetElems[i].getAttribute("facet"));
- IProjectFacetVersion projectFacetVersion = projectFacet.getVersion(facetElems[i].getAttribute("version"));
- rfv.setProjectFacetVersion(projectFacetVersion);
- String allowNewerValue = facetElems[i].getAttribute("allow-newer");
- if (allowNewerValue == null)
- {
- rfv.setAllowNewer(false);
- }
- else
- {
- rfv.setAllowNewer(Boolean.valueOf(allowNewerValue).booleanValue());
- }
-
- requiredFacetVersionList.add(rfv);
- }
-
- requiredFacetVersions = (RequiredFacetVersion[])requiredFacetVersionList.toArray(new RequiredFacetVersion[]{});
- }
-
- return requiredFacetVersions;
- }
-
- public Set getProjectFacetVersions()
- {
- if (projectFacetVersions == null)
- {
- projectFacetVersions = new HashSet();
- RequiredFacetVersion[] rfv = getRequiredFacetVersions();
- for (int i=0; i<rfv.length; i++)
- {
- projectFacetVersions.add(rfv[i].getProjectFacetVersion());
- }
- }
-
- return projectFacetVersions;
- }
-
- public RuntimeDescriptor getRuntime()
- {
- if (runtime == null)
- {
- String runtimeId = elem.getAttribute("runtimeId");
- runtime = (RuntimeDescriptor)allRuntimes.get(runtimeId);
- }
- return runtime;
- }
-
- public IWebServiceRuntime getWebServiceRuntime()
- {
- if (webServiceRuntime == null)
- {
- try
- {
- webServiceRuntime = (IWebServiceRuntime)elem.createExecutableExtension("class");
- }
- catch(CoreException ce)
- {
-
- }
- }
-
- return webServiceRuntime;
- }
-
- public IWebServiceRuntimeChecker getClientRuntimeChecker()
- {
- if (webServiceRuntimeChecker == null)
- {
- try
- {
- if (elem.getAttribute("runtimeChecker") != null ) {
- webServiceRuntimeChecker = (IWebServiceRuntimeChecker)elem.createExecutableExtension("runtimeChecker");
- }
- }
- catch(CoreException ce)
- {
-
- }
- }
-
- return webServiceRuntimeChecker;
- }
-
- public String getRuntimePreferredServerType()
- {
- if (runtimePreferredServerType == null)
- {
- runtimePreferredServerType = elem.getAttribute("runtimePreferredServerType");
- }
- return runtimePreferredServerType;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ClientType.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ClientType.java
deleted file mode 100644
index e3c4b51..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ClientType.java
+++ /dev/null
@@ -1,120 +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
- * -------- -------- -----------------------------------------------------------
- * 20060216 127138 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.wsrt;
-
-import java.util.Hashtable;
-import org.eclipse.core.runtime.IConfigurationElement;
-import com.ibm.icu.util.StringTokenizer;
-
-public class ClientType {
-
- private IConfigurationElement elem_;
- private Hashtable webServiceClientImpls_;
-
- private String id;
- private WebServiceClientImpl webServiceClientImpl;
- private String[] moduleTypesInclude;
- private String[] moduleTypesExclude;
-
-
-
- public ClientType(IConfigurationElement elem_, Hashtable webServiceClientImpls_)
- {
- super();
- this.elem_ = elem_;
- this.webServiceClientImpls_ = webServiceClientImpls_;
- }
-
-
-
- public String getId()
- {
- if (id==null)
- {
- id = elem_.getAttribute("id");
- }
- return id;
- }
-
-
-
-
- public String[] getModuleTypesExclude()
- {
- if (moduleTypesExclude==null)
- {
- String attr = elem_.getAttribute("moduleTypesExclude");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- moduleTypesExclude = new String[size];
- for (int i = 0; i < moduleTypesExclude.length; i++)
- moduleTypesExclude[i] = st.nextToken();
- }
- }
- return moduleTypesExclude;
- }
-
-
-
-
- public String[] getModuleTypesInclude()
- {
- if (moduleTypesInclude==null)
- {
- String attr = elem_.getAttribute("moduleTypesInclude");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- moduleTypesInclude = new String[size];
- for (int i = 0; i < moduleTypesInclude.length; i++)
- moduleTypesInclude[i] = st.nextToken();
- }
- }
- return moduleTypesInclude;
- }
-
-
-
-
- public WebServiceClientImpl getWebServiceClientImpl()
- {
- if (webServiceClientImpl==null)
- {
- String wscimplId = elem_.getAttribute("implId");
- webServiceClientImpl = (WebServiceClientImpl)webServiceClientImpls_.get(wscimplId);
- }
- return webServiceClientImpl;
- }
-
-
-
- /*
- public String getWebServiceClientTypeId()
- {
- if (webServiceClientTypeId==null)
- {
- webServiceClientTypeId = elem_.getAttribute("webServiceClientTypeId");
- }
- return webServiceClientTypeId;
- }
- */
-
-
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/Context.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/Context.java
deleted file mode 100644
index 034a6e8..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/Context.java
+++ /dev/null
@@ -1,143 +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.consumption.ui.wsrt;
-
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-/**
- * @author rsinha
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class Context implements IContext {
- private WebServiceScenario scenario;
- private boolean develop;
- private boolean assemble;
- private boolean deploy;
- private boolean install;
- private boolean run;
- private boolean client;
- private boolean test;
- private boolean publish;
- private boolean overWriteFiles;
- private boolean createFolders;
- private boolean checkOutFiles;
-
- public boolean getAssemble() {
- return assemble;
- }
-
- public boolean getCheckOutFiles() {
- return checkOutFiles;
- }
-
- public boolean getClient() {
- return client;
- }
-
- public boolean getCreateFolders() {
- return createFolders;
- }
-
- public boolean getDeploy() {
- return deploy;
- }
-
- public boolean getDevelop() {
- return develop;
- }
-
- public boolean getInstall() {
- return install;
- }
-
- public boolean getOverWriteFiles() {
- return overWriteFiles;
- }
-
- public boolean getPublish() {
- return publish;
- }
-
- public boolean getRun() {
- return run;
- }
-
- public WebServiceScenario getScenario() {
- return scenario;
- }
-
- public boolean getTest() {
- return test;
- }
-
- public void setAssemble(boolean assemble) {
- this.assemble = assemble;
- }
-
-
- public void setCheckOutFiles(boolean checkOutFiles) {
- this.checkOutFiles = checkOutFiles;
- }
-
-
- public void setClient(boolean client) {
- this.client = client;
- }
-
-
- public void setCreateFolders(boolean createFolders) {
- this.createFolders = createFolders;
- }
-
-
- public void setDeploy(boolean deploy) {
- this.deploy = deploy;
- }
-
-
- public void setDevelop(boolean develop) {
- this.develop = develop;
- }
-
-
- public void setInstall(boolean install) {
- this.install = install;
- }
-
-
- public void setOverWriteFiles(boolean overWriteFiles) {
- this.overWriteFiles = overWriteFiles;
- }
-
-
- public void setPublish(boolean publish) {
- this.publish = publish;
- }
-
-
- public void setRun(boolean run) {
- this.run = run;
- }
-
-
- public void setScenario(WebServiceScenario scenario) {
- this.scenario = scenario;
- }
-
-
- public void setTest(boolean test) {
- this.test = test;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/FacetMatchCache.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/FacetMatchCache.java
deleted file mode 100644
index b3f51e5..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/FacetMatchCache.java
+++ /dev/null
@@ -1,525 +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
- * -------- -------- -----------------------------------------------------------
- * 20060131 121071 rsinha@ca.ibm.com - Rupam Kuehner (initial creation)
- * 20060426 138051 kathy@ca.ibm.com - Kathy Chan
- * 20060427 126780 rsinha@ca.ibm.com - Rupam Kuehner
- * 20080923 247525 mahutch@ca.ibm.com - Mark Hutchinson, cache not updated properly when project facet versions changed
- * 20100811 322429 mahutch@ca.ibm.com - Mark Hutchinson, Improve performance of launching the Web Services Wizard
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.wsrt;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.consumption.common.FacetMatcher;
-import org.eclipse.jst.ws.internal.consumption.common.FacetSetsByTemplateCache;
-import org.eclipse.jst.ws.internal.consumption.common.FacetUtils;
-import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-
-/**
- * FacetMatchCache caches results of calculations made respecting
- * the suitability of projects and project types for serviceRuntimes
- * and clientRuntimes.
- *
- * <br/><br/>
- * Terminology used in the javadoc in this class:
- * <ul>
- * <li><b>serviceRuntime</b>: extension to org.eclipse.jst.ws.consumption.ui.serviceRuntimes.
- * The Java representation of this is org.eclipse.jst.ws.internal.consumption.ui.wsrt.ServiceRuntimeDescriptor</li>
- * <li><b>clientRuntime</b>: extension to org.eclipse.jst.ws.consumption.ui.clientRuntimes.
- * The Java representation of this is org.eclipse.jst.ws.internal.consumption.ui.wsrt.ClientRuntimeDescriptor</li>
- * </ul>
- *
- */
-public class FacetMatchCache implements IResourceChangeListener
-{
- //single instance per workbench
- private static FacetMatchCache instance_;
-
-
- //Tables related to existing projects in the workspace
-
- //serviceFacetMatchTable_:
- //key: Object of type String.
- // Forward slash separated concatenation of a serviceRuntimeId and a projectName
- // (e.g. org.eclipse.jst.ws.axis.creation.java/wp).
- //value: Object of type org.eclipse.jst.ws.internal.consumption.common.FacetMatcher.
- // The FacetMatcher contains the matching characteristics calculated for the
- // serviceRuntime and project in the key.
- private Hashtable serviceFacetMatchTable_;
-
- //serviceTableKeysByProjectName_:
- //key: Object of type String.
- // project name (e.g. wp)
- //value: Set of elements of type String. The Strings in the Set are keys from the serviceFacetMatchTable_
- // that contain the project name (e.g. org.eclipse.jst.ws.axis.creation.java/wp). Used to rapidly
- // delete entries from serviceFacetMatchTable_ after a project is deleted from the workspace.
- private Hashtable serviceTableKeysByProjectName_;
-
- //clientFacetMatchTable_;
- //key: Object of type String.
- // forward slash separated concatenation of a clientRuntimeId and a projectName
- // (e.g. org.eclipse.jst.ws.axis.consumption.java/wp)
- //value: Object of type org.eclipse.jst.ws.internal.consumption.common.FacetMatcher
- // The FacetMatcher contains the matching characteristics calculated for the
- // clientRuntime and project in the key.
- private Hashtable clientFacetMatchTable_;
-
- //clientTableKeysByProjectName_
- //key: Object of type String.
- // project name (e.g. wp)
- //value: Set of elements of type String. The Strings in the Set are keys from the clientFacetMatchTable_
- // that contain the project name (e.g. org.eclipse.jst.ws.axis.consumption.java/wp). Used to rapidly
- // delete entries from clientFacetMatchTable_ after a project is deleted from the workspace.
- private Hashtable clientTableKeysByProjectName_;
-
- //projectEntriesToDelete_: elements of type String containing the names of projects that have
- //been deleted from the workspace but their corresponding entries from serviceFacetMatchTable_
- //and clientFacetMatchTable_ have yet to be deleted.
- private List projectEntriesToDelete_;
-
-
-
- //Tables related to templates
-
- //templatesByServiceRuntimeId_:
- //key: Object of type String.
- // serviceRuntime id
- //value: Set of elements of type org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate
- // This the set of templates that support the serviceRuntime identified by the key.
- private Hashtable templatesByServiceRuntimeId_;
-
- //templatesByClientRuntimeId_
- //key: Object of type String.
- // clientRuntime id
- //value: Set of elements of type org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate
- // This the set of templates that support the clientRuntime identified by the key.
- private Hashtable templatesByClientRuntimeId_;
-
-
- /**
- * Returns a singleton instance of this class.
- *
- * @return A singleton FacetMatchCache object.
- */
- public static synchronized FacetMatchCache getInstance()
- {
- if (instance_ == null)
- {
- instance_ = new FacetMatchCache();
- instance_.load();
- }
- return instance_;
- }
-
- private void load()
- {
- serviceFacetMatchTable_ = new Hashtable();
- serviceTableKeysByProjectName_ = new Hashtable();
- clientFacetMatchTable_ = new Hashtable();
- clientTableKeysByProjectName_ = new Hashtable();
- projectEntriesToDelete_ = new ArrayList();
- templatesByClientRuntimeId_ = new Hashtable();
- templatesByServiceRuntimeId_ = new Hashtable();
-
- //Listen for deletions of projects in order to delete all entries in
- //Hashtables for the deleted project.
- ResourcesPlugin.getWorkspace().addResourceChangeListener(this, IResourceChangeEvent.PRE_DELETE);
- }
-
-
- /*
- * Returns the FacetMatcher resulting from matching a serviceRuntime or clientRuntime with an existing project.
- * @param isClient true if runtimeId is a clientRuntimeId. false if runtimeId is a serviceRuntimeId.
- * @param runtimeId the id of a clientRuntime if isClient is true or the id of a serviceRuntime if
- * isClient is false.
- * @param projectName the name of an existing project.
- *
- * @returns FacetMatcher resulting from calling FacetUtils.match(..) using the serviceRuntime or clientRuntime id
- * and the project name. Returns null if the project doesn't exist. Non-faceted existing projects will always result
- * in a FacetMatcher with isMatch() equal to false (with the exception of Java projects which are a special case
- * - see FacetUtils.getFacetsForProject()).
- */
- public synchronized FacetMatcher getMatchForProject(boolean isClient, String runtimeId, String projectName)
- {
- //Delete entries from tables if there are deletions pending.
- if (projectEntriesToDelete_.size() > 0)
- {
- Iterator projectItr = projectEntriesToDelete_.iterator();
- while(projectItr.hasNext())
- {
- String projectNameToDelete = (String)projectItr.next();
-
- //Delete entries from client table
- removeTableEntriesForProject(true, projectNameToDelete);
-
- //Delete entries from service table
- removeTableEntriesForProject(false, projectNameToDelete);
- }
-
- //Clear the projectEntriesToDelete list
- projectEntriesToDelete_.clear();
- }
-
- IProject project = ProjectUtilities.getProject(projectName);
- FacetMatcher fm = null;
- if (project != null && project.exists())
- {
- String key = getKey(runtimeId, projectName);
- if (isClient)
- {
- fm = (FacetMatcher) clientFacetMatchTable_.get(key);
- }
- else
- {
- fm = (FacetMatcher) serviceFacetMatchTable_.get(key);
- }
-
- if (fm == null)
- {
- // This combination has not yet been calculated and cached so calculate it and cache it.
- fm = calculateFacetMatcher(isClient, runtimeId, projectName);
- if (isClient)
- {
- clientFacetMatchTable_.put(key,fm);
- }
- else
- {
- serviceFacetMatchTable_.put(key, fm);
- }
- updateTableOfKeys(isClient, key, projectName);
-
- } else
- {
- // If the project's facets have changed since the last time the
- // facets were calculated, refresh the facetMatcher.
- Set currentFacetVersions = FacetUtils.getFacetsForProject(projectName);
- Set previousFacetVersions = fm.getFacetsTested();
- if (!currentFacetVersions.equals(previousFacetVersions))
- {
- //recalculate and cache the FacetMatcher
- fm = calculateFacetMatcher(isClient, runtimeId, projectName);
- if (isClient)
- {
- clientFacetMatchTable_.put(key,fm);
- }
- else
- {
- serviceFacetMatchTable_.put(key, fm);
- }
- }
- }
- }
-
- return fm;
- }
-
- /**
- * Updates serviceTableKeysByProjectName_ or clientTableKeysByProjectName_ with
- * the provided project name and key. This is called whenever a new entry is
- * added to serviceFacetMatchTable_ or clientFacetMatchTable_.
- * @param isClient true if runtimeId is a clientRuntimeId. false if runtimeId is a serviceRuntimeId.
- * @param key
- * @param projectName
- */
- private void updateTableOfKeys(boolean isClient, String key, String projectName)
- {
- Set setOfKeysForProjectName = null;
- if (isClient)
- {
- setOfKeysForProjectName = (Set)clientTableKeysByProjectName_.get(projectName);
- }
- else
- {
- setOfKeysForProjectName = (Set)serviceTableKeysByProjectName_.get(projectName);
- }
-
- if (setOfKeysForProjectName == null)
- {
- //Add an entry in the table for this project.
- Set keys = new HashSet();
- keys.add(key);
- if (isClient)
- {
- clientTableKeysByProjectName_.put(projectName, keys);
- }
- else
- {
- serviceTableKeysByProjectName_.put(projectName, keys);
- }
- }
- else
- {
- //Update the entry in the table for this project.
- setOfKeysForProjectName.add(key);
- }
- }
-
- /**
- * Returns the {@link FacetMatcher} calculated for the given serviceRuntime or clientRuntime and project
- * @param isClient true if runtimeId is a clientRuntimeId. false if runtimeId is a serviceRuntimeId.
- * @param runtimeId the id of a clientRuntime if isClient is true or the id of a serviceRuntime if
- * isClient is false.
- * @param projectName the name of an existing project.
- * @return FacetMatcher resulting from calling FacetUtils.match(..) using the serviceRuntime or clientRuntime id
- * and the project name. Returns null if the project doesn't exist. Non-faceted existing projects will always result
- * in a FacetMatcher with isMatch() equal to false (with the exception of Java projects which are a special case
- * - see FacetUtils.getFacetsForProject()).
- */
- private FacetMatcher calculateFacetMatcher(boolean isClient, String runtimeId, String projectName)
- {
- FacetMatcher fm = null;
- RequiredFacetVersion[] rfvs = null;
- if (isClient)
- {
- ClientRuntimeDescriptor desc = WebServiceRuntimeExtensionUtils2.getClientRuntimeDescriptorById(runtimeId);
- rfvs = desc.getRequiredFacetVersions();
- }
- else
- {
- ServiceRuntimeDescriptor desc = WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(runtimeId);
- rfvs = desc.getRequiredFacetVersions();
- }
-
- Set facetVersions = new HashSet(FacetUtils.getFacetsForProject(projectName));
- if (facetVersions == null)
- {
- fm = new FacetMatcher();
- fm.setMatch(false);
- return fm;
- }
-
- fm = FacetUtils.match(rfvs, facetVersions);
-
- // Check if the facet runtime required by the required facet is supported
- // by the project without chaning it's current facet runtime
-
- IRuntime fProjectRuntime = FacetUtils.getFacetRuntimeForProject(projectName);
- if (fProjectRuntime != null) {
- String fProjectRuntimeName = fProjectRuntime.getName();
- boolean projectSupportRequiredFacetRuntime = false;
- Set rts = FacetUtils.getRuntimes(rfvs);
- for (Iterator iterator = rts.iterator(); iterator.hasNext() && !projectSupportRequiredFacetRuntime;) {
- IRuntime fRequiredRuntime = (IRuntime) iterator.next();
- if (fRequiredRuntime != null) {
- if (fRequiredRuntime.getName().equals(fProjectRuntimeName)) {
- projectSupportRequiredFacetRuntime = true;
- }
- }
- }
-
- // if project does not support the required facet runtime, set FacetMatch match to false
- if (!projectSupportRequiredFacetRuntime) {
- fm.setMatch(false);
- }
- }
- return fm;
- }
-
- private String getKey(String a, String b)
- {
- StringBuffer keysb = new StringBuffer();
- keysb.append(a);
- keysb.append("/");
- keysb.append(b);
- return keysb.toString();
- }
-
- /**
- * Removes all table entries in this cache for the given project
- * @param isClient true to remove entries from client side tables. false to remove entries from service side tables
- * @param projectName
- */
- private void removeTableEntriesForProject(boolean isClient, String projectName)
- {
- //First remove the entries from clientFacetMatchTable_ or serviceFacetMatchTable_
- //that have keys containing this project name.
- Set setOfKeysForProjectName = null;
- if (isClient)
- {
- setOfKeysForProjectName = (Set)clientTableKeysByProjectName_.get(projectName);
- }
- else
- {
- setOfKeysForProjectName = (Set)serviceTableKeysByProjectName_.get(projectName);
- }
-
- if (setOfKeysForProjectName != null)
- {
- Iterator keysItr = setOfKeysForProjectName.iterator();
- while (keysItr.hasNext())
- {
- String key = (String)keysItr.next();
- if (isClient)
- {
- clientFacetMatchTable_.remove(key);
- }
- else
- {
- serviceFacetMatchTable_.remove(key);
- }
- }
-
- //Second, remove the entry in clientTableKeysByProjectName_ or serviceTableKeysByProjectName_
- //with this projectName as the key.
- if (isClient)
- {
- clientTableKeysByProjectName_.remove(projectName);
- }
- else
- {
- serviceTableKeysByProjectName_.remove(projectName);
- }
-
- }
-
- }
-
- /**
- * Returns a set of templates supported by the given clientRuntime
- * @param clientRuntimeId id of a clientRuntime
- * @returns Set (elementtype: IFacetedProjectTemplate)
- */
- public synchronized Set getTemplatesForClientRuntime(String clientRuntimeId)
- {
- Set templates = (Set)templatesByClientRuntimeId_.get(clientRuntimeId);
- if (templates != null)
- {
- //Return the cached set of templates.
- return templates;
- }
- else
- {
- //Calculate the templates, cache them for later use, and return them.
- ClientRuntimeDescriptor desc = WebServiceRuntimeExtensionUtils2.getClientRuntimeDescriptorById(clientRuntimeId);
-
- Set validTemplates = null;
- Set<String> suitableIds = desc.getSuitableProjectTemplates();
- if (!suitableIds.isEmpty()) {
- //If a list of suitable project templates is specified in the metadata, then use those project templates and do not search
- validTemplates = new HashSet(1);
- for (String s : suitableIds) {
- IFacetedProjectTemplate t = ProjectFacetsManager.getTemplate(s);
- if (t != null)
- validTemplates.add(t);
- }
- }
-
- //if the set of valid templates is still empty, then search for valid templates based on required facet versions
- if (validTemplates == null || validTemplates.isEmpty()) {
- validTemplates = getTemplates(desc.getRequiredFacetVersions(), desc.getUnsuitableProjectTemplates());
- }
-
- templatesByClientRuntimeId_.put(clientRuntimeId, validTemplates);
- return validTemplates;
- }
- }
-
- /**
- * Returns a set of templates supported by the given serviceRuntime
- * @param serviceRuntimeId id of a serviceRuntime
- * @returns Set (elementtype: IFacetedProjectTemplate)
- */
- public synchronized Set getTemplatesForServiceRuntime(String serviceRuntimeId)
- {
- Set templates = (Set)templatesByServiceRuntimeId_.get(serviceRuntimeId);
- if (templates != null)
- {
- //Return the cached set of templates.
- return templates;
- }
- else
- {
- //Calculate the templates, cache them for later use, and return them.
- ServiceRuntimeDescriptor desc = WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceRuntimeId);
- Set validTemplates = null;
- Set<String> suitableIds = desc.getSuitableProjectTemplates();
- if (!suitableIds.isEmpty()) {
- //If a list of suitable project templates is specified in the metadata, then use those project templates and do not search
- validTemplates = new HashSet(1);
- for (String s : suitableIds) {
- IFacetedProjectTemplate t = ProjectFacetsManager.getTemplate(s);
- if (t != null)
- validTemplates.add(t);
- }
- }
-
- //if the set of valid templates is still empty, then search for valid templates based on required facet versions
- if (validTemplates == null || validTemplates.isEmpty()) {
- validTemplates = getTemplates(desc.getRequiredFacetVersions(), desc.getUnsuitableProjectTemplates());
- }
-
- templatesByServiceRuntimeId_.put(serviceRuntimeId, validTemplates);
- return validTemplates;
- }
- }
-
- /**
- * Returns the set of templates that supported the given required facet versions.
- * @param requiredFacetVersions
- * @param unSuitableTemplates set of unsuitable template ids to exclude from the search for increased performance
- * @return Set containing elemets of type {@link IFacetedProjectTemplate}.
- */
- private Set getTemplates(RequiredFacetVersion[] requiredFacetVersions, Set<String> unSuitableTemplates) {
- Set templates = new HashSet();
- for( Iterator itr = ProjectFacetsManager.getTemplates().iterator(); itr.hasNext(); ) {
- final IFacetedProjectTemplate template = (IFacetedProjectTemplate) itr.next();
- String templateId = template.getId();
- if (unSuitableTemplates == null || !unSuitableTemplates.contains(templateId)) { //if we know the template is unsuitable, then exclude it
- if (templateId.indexOf("ear") == -1 && templateId.indexOf("wst.web") == -1) { //Don't include the EARs!!
- Set[] combinations = FacetSetsByTemplateCache.getInstance().getFacetVersionCombinationsFromTemplate(templateId);
-
- for (int i=0; i<combinations.length; i++) {
- FacetMatcher fm = FacetUtils.match(requiredFacetVersions, combinations[i]);
- if (fm.isMatch()) {
- //Found a combination that worked. Add the template to the list and move on.
- templates.add(template);
- break;
- }
- }
- }
- }
- }
- return templates;
- }
-
- public synchronized void resourceChanged(IResourceChangeEvent event)
- {
- if (event.getType() == IResourceChangeEvent.PRE_DELETE)
- {
- IResource projectResource = event.getResource();
- if (projectResource!=null)
- {
- String projectName = projectResource.getName();
-
- //Add this project name to the list of project entries
- //to delete. Next time getMatchForProject is called all
- //entries for this project from all tables in this cache
- //will be deleted.
- projectEntriesToDelete_.add(projectName);
- }
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/RuntimeDescriptor.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/RuntimeDescriptor.java
deleted file mode 100644
index ac2bb37..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/RuntimeDescriptor.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
- * -------- -------- -----------------------------------------------------------
- * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wsrt;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-public class RuntimeDescriptor
-{
-
- private IConfigurationElement elem;
- private String id;
- private String label;
- private String serverRequiredString;
- private boolean serverRequired;
-
-
- public RuntimeDescriptor(IConfigurationElement elem)
- {
- this.elem = elem;
- }
-
- public String getId()
- {
- if (id == null)
- {
- id = elem.getAttribute("id");
- }
- return id;
- }
-
- public String getLabel()
- {
- if (label == null)
- {
- label = elem.getAttribute("label");
- }
- return label;
- }
-
- public String[] getJ2eeLevels()
- {
- return new String[]{"13", "14"};
- }
-
- public boolean getServerRequired()
- {
- if (serverRequiredString == null)
- {
- //Defaults to true if the extension omits this attribute
- serverRequired = true;
-
- serverRequiredString = elem.getAttribute("serverRequired");
- if (serverRequiredString != null)
- {
- serverRequired = Boolean.valueOf(serverRequiredString).booleanValue();
- }
-
- }
- return serverRequired;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/Selection.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/Selection.java
deleted file mode 100644
index 631454b..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/Selection.java
+++ /dev/null
@@ -1,30 +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.consumption.ui.wsrt;
-
-import org.eclipse.wst.ws.internal.wsrt.ISelection;
-
-public class Selection implements ISelection {
-
- private Object[] selection;
-
- public Object[] getSelection()
- {
- return selection;
- }
-
- public void setSelection(Object[] selection)
- {
- this.selection = selection;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ServiceRuntimeDescriptor.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ServiceRuntimeDescriptor.java
deleted file mode 100644
index 2397cbe..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ServiceRuntimeDescriptor.java
+++ /dev/null
@@ -1,255 +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
- * -------- -------- -----------------------------------------------------------
- * 20060802 152150 mahutch@ca.ibm.com
- * 20071107 203826 kathy@ca.ibm.com - Kathy Chan
- * 20071130 203826 kathy@ca.ibm.com - Kathy Chan
- * 20080326 221364 kathy@ca.ibm.com - Kathy Chan
- * 20080626 221364 kathy@ca.ibm.com - Kathy Chan
- * 20100811 322429 mahutch@ca.ibm.com - Mark Hutchinson, Improve performance of launching the Web Services Wizard
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wsrt;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion;
-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;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntime;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntimeChecker;
-
-
-public class ServiceRuntimeDescriptor
-{
- private IConfigurationElement elem;
- private Hashtable allWebServiceImpls;
- private Hashtable allRuntimes;
- private String id;
- private WebServiceImpl serviceImplementationType;
- private RuntimeDescriptor runtime;
- private boolean bottomUp = false;
- private boolean topDown = false;
- private String serviceRuntimeClassName;
- private IWebServiceRuntime webServiceRuntime;
- private RequiredFacetVersion[] requiredFacetVersions;
- private Set projectFacetVersions;
- private IWebServiceRuntimeChecker webServiceRuntimeChecker;
- private String runtimePreferredServerType;
- private Set<String> suitableProjectTemplates;
- private Set<String> unsuitableProjectTemplates;
-
- public ServiceRuntimeDescriptor(IConfigurationElement elem, Hashtable allWebServiceImpls, Hashtable allRuntimes)
- {
- this.elem = elem;
- this.allWebServiceImpls = allWebServiceImpls;
- this.allRuntimes = allRuntimes;
-
- bottomUp = (Boolean.valueOf(elem.getAttribute("bottomUp"))).booleanValue();
- topDown = (Boolean.valueOf(elem.getAttribute("topDown"))).booleanValue();
- }
-
- public boolean getBottomUp()
- {
- return bottomUp;
- }
-
- public String getId()
- {
- if (id == null)
- {
- id = elem.getAttribute("id");
- }
- return id;
- }
-
-
- public void processServiceRuntimeProperties(IConfigurationElement elem) {
- if (suitableProjectTemplates == null) {
- suitableProjectTemplates = new HashSet<String>(5);
- }
- if (unsuitableProjectTemplates == null) {
- unsuitableProjectTemplates = new HashSet<String>(5);
- }
- IConfigurationElement[] elements = elem.getChildren("suitable-project-template");
- for (IConfigurationElement configElement : elements) {
- String templateId = configElement.getAttribute("id");
- if (templateId != null)
- suitableProjectTemplates.add(templateId);
- }
- elements = elem.getChildren("unsuitable-project-template");
- for (IConfigurationElement configElement : elements) {
- String templateId = configElement.getAttribute("id");
- if (templateId != null)
- unsuitableProjectTemplates.add(templateId);
- }
- }
-
- //this will return an empty list if no valid suitable-project-template elements found
- public Set<String> getSuitableProjectTemplates() {
- if (suitableProjectTemplates == null) {
- suitableProjectTemplates = new HashSet<String>(5);
- }
- return suitableProjectTemplates;
- }
-
- //this will return an empty list if no valid unsuitable-project-template elements found
- public Set<String> getUnsuitableProjectTemplates() {
- if (unsuitableProjectTemplates == null) {
- unsuitableProjectTemplates = new HashSet<String>(5);
- }
- return unsuitableProjectTemplates;
- }
-
- public RequiredFacetVersion[] getRequiredFacetVersions()
- {
- if (requiredFacetVersions == null)
- {
- ArrayList requiredFacetVersionList = new ArrayList();
- IConfigurationElement[] facetElems = elem.getChildren("required-facet-version");
- for (int i = 0; i < facetElems.length; i++)
- {
- try {
- String facetID = facetElems[i].getAttribute("facet");
- if (ProjectFacetsManager.isProjectFacetDefined(facetID))
- {
- RequiredFacetVersion rfv = new RequiredFacetVersion();
- IProjectFacet projectFacet = ProjectFacetsManager.getProjectFacet(facetID);
- if (projectFacet != null) {
- IProjectFacetVersion projectFacetVersion = projectFacet.getVersion(facetElems[i].getAttribute("version"));
- if (projectFacetVersion != null) {
- rfv.setProjectFacetVersion(projectFacetVersion);
- String allowNewerValue = facetElems[i].getAttribute("allow-newer");
- if (allowNewerValue == null)
- {
- rfv.setAllowNewer(false);
- }
- else
- {
- rfv.setAllowNewer(Boolean.valueOf(allowNewerValue).booleanValue());
- }
-
- requiredFacetVersionList.add(rfv);
- }
- }
-
- }
- } catch (IllegalArgumentException e){
- // ignore the facet
- }
- }
-
- requiredFacetVersions = (RequiredFacetVersion[])requiredFacetVersionList.toArray(new RequiredFacetVersion[]{});
- }
-
- return requiredFacetVersions;
- }
-
- public Set getProjectFacetVersions()
- {
- if (projectFacetVersions == null)
- {
- projectFacetVersions = new HashSet();
- RequiredFacetVersion[] rfv = getRequiredFacetVersions();
- for (int i=0; i<rfv.length; i++)
- {
- projectFacetVersions.add(rfv[i].getProjectFacetVersion());
- }
- }
-
- return projectFacetVersions;
- }
-
- public RuntimeDescriptor getRuntime()
- {
- if (runtime == null)
- {
- String runtimeId = elem.getAttribute("runtimeId");
- runtime = (RuntimeDescriptor)allRuntimes.get(runtimeId);
- }
- return runtime;
- }
-
- public WebServiceImpl getServiceImplementationType()
- {
- if (serviceImplementationType == null)
- {
- String serviceImplementationTypeId = elem.getAttribute("serviceImplementationTypeId");
- serviceImplementationType = (WebServiceImpl)allWebServiceImpls.get(serviceImplementationTypeId);
- }
- return serviceImplementationType;
- }
-
- public String getServiceRuntimeClassName()
- {
- if (serviceRuntimeClassName == null)
- {
- serviceRuntimeClassName = elem.getAttribute("class");
- }
- return serviceRuntimeClassName;
- }
-
- public boolean getTopDown()
- {
- return topDown;
- }
-
- public IWebServiceRuntime getWebServiceRuntime()
- {
- if (webServiceRuntime == null)
- {
- try
- {
- webServiceRuntime = (IWebServiceRuntime)elem.createExecutableExtension("class");
- }
- catch(CoreException ce)
- {
-
- }
- }
-
- return webServiceRuntime;
- }
-
- public IWebServiceRuntimeChecker getServiceRuntimeChecker()
- {
- if (webServiceRuntimeChecker == null)
- {
- try
- {
- if (elem.getAttribute("runtimeChecker") != null ) {
- webServiceRuntimeChecker = (IWebServiceRuntimeChecker)elem.createExecutableExtension("runtimeChecker");
- }
- }
- catch(CoreException ce)
- {
-
- }
- }
-
- return webServiceRuntimeChecker;
- }
-
- public String getRuntimePreferredServerType()
- {
- if (runtimePreferredServerType == null)
- {
- runtimePreferredServerType = elem.getAttribute("runtimePreferredServerType");
- }
- return runtimePreferredServerType;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ServiceType.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ServiceType.java
deleted file mode 100644
index 417cc29..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ServiceType.java
+++ /dev/null
@@ -1,201 +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
- * -------- -------- -----------------------------------------------------------
- * 20060216 127138 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.wsrt;
-
-import java.util.Hashtable;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-import com.ibm.icu.util.StringTokenizer;
-
-public class ServiceType {
-
- private IConfigurationElement elem_;
- private Hashtable webServiceImpls_;
- private String id;
- private WebServiceImpl webServiceImpl;
- private String[] bottomUpModuleTypesInclude;
- private String[] topDownModuleTypesInclude;
- private String[] bottomUpModuleTypesExclude;
- private String[] topDownModuleTypesExclude;
-
-
-
-
- public ServiceType(IConfigurationElement elem_, Hashtable webServiceImpls_)
- {
- super();
- this.elem_ = elem_;
- this.webServiceImpls_ = webServiceImpls_;
- }
-
- public String[] getBottomUpModuleTypesExclude()
- {
- if (bottomUpModuleTypesExclude==null)
- {
- String attr = elem_.getAttribute("buModuleTypesExclude");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- bottomUpModuleTypesExclude = new String[size];
- for (int i = 0; i < bottomUpModuleTypesExclude.length; i++)
- bottomUpModuleTypesExclude[i] = st.nextToken();
- }
- }
- return bottomUpModuleTypesExclude;
- }
-
- public void setBottomUpModuleTypesExclude(String[] bottomUpModuleTypesExclude)
- {
- this.bottomUpModuleTypesExclude = bottomUpModuleTypesExclude;
- }
-
- public String[] getBottomUpModuleTypesInclude()
- {
- if (bottomUpModuleTypesInclude==null)
- {
- String attr = elem_.getAttribute("buModuleTypesInclude");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- bottomUpModuleTypesInclude = new String[size];
- for (int i = 0; i < bottomUpModuleTypesInclude.length; i++)
- bottomUpModuleTypesInclude[i] = st.nextToken();
- }
- }
- return bottomUpModuleTypesInclude;
- }
-
- public void setBottomUpModuleTypesInclude(String[] bottomUpModuleTypesInclude)
- {
- this.bottomUpModuleTypesInclude = bottomUpModuleTypesInclude;
- }
-
- public String getId()
- {
- if (id==null)
- {
- id = elem_.getAttribute("id");
- }
- return id;
- }
-
- public void setId(String id)
- {
- this.id = id;
- }
-
- public String[] getTopDownModuleTypesExclude()
- {
- if (topDownModuleTypesExclude==null)
- {
- String attr = elem_.getAttribute("tdModuleTypesExclude");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- topDownModuleTypesExclude = new String[size];
- for (int i = 0; i < topDownModuleTypesExclude.length; i++)
- topDownModuleTypesExclude[i] = st.nextToken();
- }
- }
- return topDownModuleTypesExclude;
- }
-
- public void setTopDownModuleTypesExclude(String[] topDownModuleTypesExclude)
- {
- this.topDownModuleTypesExclude = topDownModuleTypesExclude;
- }
-
- public String[] getTopDownModuleTypesInclude()
- {
- if (topDownModuleTypesInclude==null)
- {
- String attr = elem_.getAttribute("tdModuleTypesInclude");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- topDownModuleTypesInclude = new String[size];
- for (int i = 0; i < topDownModuleTypesInclude.length; i++)
- topDownModuleTypesInclude[i] = st.nextToken();
- }
- }
- return topDownModuleTypesInclude;
- }
-
- public void setTopDownModuleTypesInclude(String[] topDownModuleTypesInclude)
- {
- this.topDownModuleTypesInclude = topDownModuleTypesInclude;
- }
-
- public WebServiceImpl getWebServiceImpl()
- {
- if (webServiceImpl == null)
- {
- String wsimplId = elem_.getAttribute("implId");
- webServiceImpl = (WebServiceImpl)webServiceImpls_.get(wsimplId);
- }
- return webServiceImpl;
- }
-
- public void setWebServiceImpl1(WebServiceImpl webServiceImpl)
- {
- this.webServiceImpl = webServiceImpl;
- }
-
- public boolean supportsScenario(int scenario)
- {
- switch(scenario)
- {
- case WebServiceScenario.BOTTOMUP:
- String[] bus = getBottomUpModuleTypesInclude();
- if (bus!=null && bus.length>0)
- {
- return true;
- }
- break;
- case WebServiceScenario.TOPDOWN:
- String[] tds = getTopDownModuleTypesInclude();
- if (tds!=null && tds.length>0)
- {
- return true;
- }
- break;
- default:
-
- }
-
- return false;
- }
-
- public String[] getModuleTypesInclude(int scenario)
- {
- switch(scenario)
- {
- case WebServiceScenario.BOTTOMUP:
- return getBottomUpModuleTypesInclude();
- case WebServiceScenario.TOPDOWN:
- return getTopDownModuleTypesInclude();
- default:
- }
-
- return null;
- }
-
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceClientImpl.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceClientImpl.java
deleted file mode 100644
index d187b3a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceClientImpl.java
+++ /dev/null
@@ -1,45 +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.consumption.ui.wsrt;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-public class WebServiceClientImpl {
-
- private IConfigurationElement elem_;
- private String id;
- private String label;
-
- public WebServiceClientImpl(IConfigurationElement elem_)
- {
- super();
- this.elem_ = elem_;
- }
-
- public String getId()
- {
- if (id==null)
- {
- id = elem_.getAttribute("id");
- }
- return id;
- }
-
-
- public String getLabel()
- {
- if (label==null)
- {
- label = elem_.getAttribute("label");
- }
- return label;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceImpl.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceImpl.java
deleted file mode 100644
index 6caf1ac..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceImpl.java
+++ /dev/null
@@ -1,120 +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
- * -------- -------- -----------------------------------------------------------
- * 20060216 127138 pmoogk@ca.ibm.com - Peter Moogk
- * 20070509 182274 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.wsrt;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.ws.internal.wsrt.IMerger;
-
-import com.ibm.icu.util.StringTokenizer;
-
-public class WebServiceImpl {
-
- private IConfigurationElement elem_;
- private String id;
- private String label;
- private String[] resourceTypeMetadata;
- private String[] extensionMetadata;
- private String objectSelectionWidget;
- private IMerger mergerClass;
-
- public WebServiceImpl(IConfigurationElement elem_)
- {
- super();
- this.elem_ = elem_;
- }
-
- public String[] getExtensionMetadata()
- {
- if (extensionMetadata==null)
- {
- String attr = elem_.getAttribute("extensionMetadata");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- extensionMetadata = new String[size];
- for (int i = 0; i < extensionMetadata.length; i++)
- extensionMetadata[i] = st.nextToken();
- }
- }
- return extensionMetadata;
- }
-
-
- public String getId()
- {
- if (id==null)
- {
- id = elem_.getAttribute("id");
- }
- return id;
- }
-
-
- public String getLabel()
- {
- if (label==null)
- {
- label = elem_.getAttribute("label");
- }
- return label;
- }
-
-
- public String[] getResourceTypeMetadata()
- {
- if (resourceTypeMetadata==null)
- {
- String attr = elem_.getAttribute("resourceTypeMetadata");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- resourceTypeMetadata = new String[size];
- for (int i = 0; i < resourceTypeMetadata.length; i++)
- resourceTypeMetadata[i] = st.nextToken();
- }
- }
- return resourceTypeMetadata;
- }
-
- public String getObjectSelectionWidget()
- {
- if (objectSelectionWidget==null)
- {
- objectSelectionWidget = elem_.getAttribute("objectSelectionWidget");
- }
- return objectSelectionWidget;
- }
-
-public IMerger getMergerClass() {
- if (mergerClass == null)
- {
- try
- {
- mergerClass = (IMerger) elem_.createExecutableExtension("mergerClass");
- }
- catch(CoreException ce)
- {
-
- }
- }
- return mergerClass;
-}
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionRegistry.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionRegistry.java
deleted file mode 100644
index ec58dee..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionRegistry.java
+++ /dev/null
@@ -1,216 +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.consumption.ui.wsrt;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Hashtable;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-public class WebServiceRuntimeExtensionRegistry
-{
-
- private static WebServiceRuntimeExtensionRegistry instance_;
-
- HashMap webServiceTypes_;
-
- ArrayList webServiceTypesList_;
-
- ArrayList webServiceClientTypesList_;
-
- Hashtable webServiceImpls_;
-
- Hashtable webServiceClientImpls_;
-
- Hashtable serviceTypes_;
-
- Hashtable clientTypes_;
-
- Hashtable webServiceRuntimes_;
-
- /**
- * Returns a singleton instance of this class.
- *
- * @return A singleton WebServiceRuntimeExtensionRegistry object.
- */
- public static WebServiceRuntimeExtensionRegistry getInstance()
- {
- if (instance_ == null)
- {
- instance_ = new WebServiceRuntimeExtensionRegistry();
- instance_.load();
- }
- return instance_;
- }
-
- private void load()
- {
- // Can't get rid of webServiceTypes in M4
- webServiceTypes_ = new HashMap();
- webServiceTypesList_ = new ArrayList();
- webServiceClientTypesList_ = new ArrayList();
- webServiceImpls_ = new Hashtable();
- webServiceClientImpls_ = new Hashtable();
- serviceTypes_ = new Hashtable();
- clientTypes_ = new Hashtable();
- webServiceRuntimes_ = new Hashtable();
-
- IExtensionRegistry reg = Platform.getExtensionRegistry();
-
- //Load WebServiceImpls
- IConfigurationElement[] wsImplExts = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption.ui", "wsImpl");
-
- for(int idx=0; idx<wsImplExts.length; idx++)
- {
- IConfigurationElement elem = wsImplExts[idx];
-
- if (elem.getName().equals("webServiceImpl"))
- {
- WebServiceImpl wsimpl = new WebServiceImpl(elem);
- webServiceImpls_.put(elem.getAttribute("id"), wsimpl);
- }
- }
-
- //Load WebServiceClientImpls
- IConfigurationElement[] wsClientImplExts = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption.ui", "wsClientImpl");
-
- for(int idx=0; idx<wsClientImplExts.length; idx++)
- {
- IConfigurationElement elem = wsClientImplExts[idx];
-
- if (elem.getName().equals("webServiceClientImpl"))
- {
- WebServiceClientImpl wsClientImpl = new WebServiceClientImpl(elem);
- webServiceClientImpls_.put(elem.getAttribute("id"), wsClientImpl);
- }
- }
-
- //Load ServiceTypes
- IConfigurationElement[] serviceTypeExts = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption.ui", "serviceType");
-
- for(int idx=0; idx<serviceTypeExts.length; idx++)
- {
- IConfigurationElement elem = serviceTypeExts[idx];
-
- if (elem.getName().equals("serviceType"))
- {
- ServiceType st = new ServiceType(elem,webServiceImpls_);
- serviceTypes_.put(elem.getAttribute("id"), st);
- }
- }
-
- //Load ClientTypes
- IConfigurationElement[] clientTypeExts = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption.ui", "clientType");
-
- for(int idx=0; idx<clientTypeExts.length; idx++)
- {
- IConfigurationElement elem = clientTypeExts[idx];
-
- if (elem.getName().equals("clientType"))
- {
- ClientType ct = new ClientType(elem,webServiceClientImpls_);
- clientTypes_.put(elem.getAttribute("id"), ct);
- }
- }
-
- //Load WebSerivceRuntimes
- IConfigurationElement[] wsrtExts = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption.ui", "webServiceRuntime");
-
- for(int idx=0; idx<wsrtExts.length; idx++)
- {
- IConfigurationElement elem = wsrtExts[idx];
-
- if (elem.getName().equals("webServiceRuntime"))
- {
- WebServiceRuntimeInfo wsrtInfo = new WebServiceRuntimeInfo(elem, serviceTypes_, clientTypes_);
- webServiceRuntimes_.put(elem.getAttribute("id"), wsrtInfo);
-
- //Update the type lists
- updateWebServiceTypeList(wsrtInfo);
- updateWebServiceClientTypeList(wsrtInfo);
-
- }
- }
- }
-
- private void updateWebServiceTypeList(WebServiceRuntimeInfo wsrtInfo)
- {
- ServiceType[] sts = wsrtInfo.getServiceTypes();
- if (sts != null)
- {
- for (int j = 0; j < sts.length; j++)
- {
- String implId = sts[j].getWebServiceImpl().getId();
- String[] bus = sts[j].getBottomUpModuleTypesInclude();
- String[] tds = sts[j].getTopDownModuleTypesInclude();
- if (bus != null)
- {
- StringBuffer entrybuff = new StringBuffer();
- entrybuff.append(String.valueOf(WebServiceScenario.BOTTOMUP));
- entrybuff.append("/");
- entrybuff.append(implId);
- String entry = entrybuff.toString();
- if (!webServiceTypesList_.contains(entry))
- {
- webServiceTypesList_.add(entry);
- }
- }
- if (tds != null)
- {
- StringBuffer entrybuff = new StringBuffer();
- entrybuff.append(String.valueOf(WebServiceScenario.TOPDOWN));
- entrybuff.append("/");
- entrybuff.append(implId);
- String entry = entrybuff.toString();
- if (!webServiceTypesList_.contains(entry))
- {
- webServiceTypesList_.add(entry);
- }
- }
- }
- }
- }
-
- private void updateWebServiceClientTypeList(WebServiceRuntimeInfo wsrtInfo)
- {
- ClientType[] cts = wsrtInfo.getClientTypes();
- if (cts != null)
- {
- for (int j = 0; j < cts.length; j++)
- {
- String implId = cts[j].getWebServiceClientImpl().getId();
- String[] mods = cts[j].getModuleTypesInclude();
- if (mods != null)
- {
- StringBuffer entrybuff = new StringBuffer();
- entrybuff.append(String.valueOf(WebServiceScenario.CLIENT));
- entrybuff.append("/");
- entrybuff.append(implId);
- String entry = entrybuff.toString();
- if (!webServiceClientTypesList_.contains(entry))
- {
- webServiceClientTypesList_.add(entry);
- }
- }
- }
- }
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionRegistry2.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionRegistry2.java
deleted file mode 100644
index afd2092..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionRegistry2.java
+++ /dev/null
@@ -1,252 +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
- * -------- -------- -----------------------------------------------------------
- * 20060427 126780 rsinha@ca.ibm.com - Rupam Kuehner
- * 20100811 322429 mahutch@ca.ibm.com - Mark Hutchinson, Improve performance of launching the Web Services Wizard
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wsrt;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-public class WebServiceRuntimeExtensionRegistry2
-{
-
- private static WebServiceRuntimeExtensionRegistry2 instance_;
-
- //webServiceImpls_:
- //key: id attribute of extension to org.eclipse.jst.ws.consumption.ui.wsImpl
- //value: org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceImpl
- Hashtable webServiceImpls_;
-
- //webServiceClientImpls_:
- //key: id attribute of extension to org.eclipse.jst.ws.consumption.ui.wsClientImpl
- //value: org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceClientImpl
- Hashtable webServiceClientImpls_;
-
- //runtimes_:
- //key: id attribute of extension to org.eclipse.jst.ws.consumption.ui.runtimes
- //value: org.eclipse.jst.ws.internal.consumption.ui.wsrt.RuntimeDescriptor
- Hashtable runtimes_;
-
- //serviceRuntimes_:
- //key: id attribute of extension to org.eclipse.jst.ws.consumption.ui.serviceRuntimes
- //value: org.eclipse.jst.ws.internal.consumption.ui.wsrt.ServiceRuntimeDescriptor
- Hashtable serviceRuntimes_;
-
- //clientRuntimes_:
- //key: id attribute of extension to org.eclipse.jst.ws.consumption.ui.clientRuntimes
- //value: org.eclipse.jst.ws.internal.consumption.ui.wsrt.ClientRuntimeDescriptor
- Hashtable clientRuntimes_;
-
- //webServiceTypesList_ contains a list of String values in this form: "scenario/webServiceImplId",
- //where sceanrio the String representation of one of
- //org.eclipse.wst.ws.internal.wsrt.WebServiceScenario.BOTTOM_UP or
- //org.eclipse.wst.ws.internal.wsrt.WebServiceScenario.TOP_DOWN
- //and webServiceImplId is the id attribute of an extension to org.eclipse.jst.ws.consumption.ui.wsImpl
- //This list is used to determine the items displayed in the WebServiceType combo-box of page 1 of the
- //Web serivce wizard.
- ArrayList webServiceTypesList_;
-
- //TODO: Not used. Remove this and all references to it in this class.
- ArrayList webServiceClientTypesList_;
-
-
- /**
- * Returns a singleton instance of this class.
- *
- * @return A singleton WebServiceRuntimeExtensionRegistry2 object.
- */
- public static WebServiceRuntimeExtensionRegistry2 getInstance()
- {
- if (instance_ == null)
- {
- instance_ = new WebServiceRuntimeExtensionRegistry2();
- instance_.load();
- }
- return instance_;
- }
-
- private void load()
- {
- webServiceImpls_ = new Hashtable();
- webServiceClientImpls_ = new Hashtable();
- runtimes_ = new Hashtable();
- serviceRuntimes_ = new Hashtable();
- clientRuntimes_ = new Hashtable();
- webServiceTypesList_ = new ArrayList();
- webServiceClientTypesList_ = new ArrayList();
-
-
- IExtensionRegistry reg = Platform.getExtensionRegistry();
-
-// Load WebServiceImpls by reading all extensions to org.eclipse.jst.ws.consumption.ui.wsImpl
- IConfigurationElement[] wsImplExts = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption.ui", "wsImpl");
-
- for(int idx=0; idx<wsImplExts.length; idx++)
- {
- IConfigurationElement elem = wsImplExts[idx];
- if (elem.getName().equals("webServiceImpl"))
- {
- WebServiceImpl wsimpl = new WebServiceImpl(elem);
- webServiceImpls_.put(elem.getAttribute("id"), wsimpl);
- }
- }
-
- //Load WebServiceClientImpls by reading all extensions to org.eclipse.jst.ws.consumption.ui.wsClientImpl
- IConfigurationElement[] wsClientImplExts = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption.ui", "wsClientImpl");
-
- for(int idx=0; idx<wsClientImplExts.length; idx++)
- {
- IConfigurationElement elem = wsClientImplExts[idx];
-
- if (elem.getName().equals("webServiceClientImpl"))
- {
- WebServiceClientImpl wsClientImpl = new WebServiceClientImpl(elem);
- webServiceClientImpls_.put(elem.getAttribute("id"), wsClientImpl);
- }
- }
-
- //Load runtimes by reading all extensions to org.eclipse.jst.ws.consumption.ui.runtimes
- IConfigurationElement[] runtimeExts = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption.ui", "runtimes");
-
- for(int idx=0; idx<runtimeExts.length; idx++)
- {
- IConfigurationElement elem = runtimeExts[idx];
-
- if (elem.getName().equals("runtime"))
- {
- RuntimeDescriptor rd = new RuntimeDescriptor(elem);
- runtimes_.put(elem.getAttribute("id"), rd);
- }
- }
-
- //Load serviceRuntimes by reading all extensions to org.eclipse.jst.ws.consumption.ui.serviceRuntimes
- IConfigurationElement[] serviceRuntimeExts = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption.ui", "serviceRuntimes");
-
- for(int idx=0; idx<serviceRuntimeExts.length; idx++)
- {
- IConfigurationElement elem = serviceRuntimeExts[idx];
-
- if (elem.getName().equals("serviceRuntime"))
- {
- ServiceRuntimeDescriptor rd = new ServiceRuntimeDescriptor(elem, webServiceImpls_, runtimes_);
- serviceRuntimes_.put(elem.getAttribute("id"), rd);
- updateWebServiceTypeList(rd);
- }
- }
-
- //Load clientRuntimes by reading all extensions to org.eclipse.jst.ws.consumption.ui.clientRuntimes
- IConfigurationElement[] clientRuntimeExts = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption.ui", "clientRuntimes");
-
- for(int idx=0; idx<clientRuntimeExts.length; idx++)
- {
- IConfigurationElement elem = clientRuntimeExts[idx];
-
- if (elem.getName().equals("clientRuntime"))
- {
- ClientRuntimeDescriptor rd = new ClientRuntimeDescriptor(elem, webServiceClientImpls_, runtimes_);
- clientRuntimes_.put(elem.getAttribute("id"), rd);
- updateWebServiceClientTypeList(rd);
-
- }
- }
-
- //Load clientRuntimeProperties and update client Runtimes
- IConfigurationElement[] clientRuntimeProperties = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption.ui", "clientRuntimeProperties");
- for (IConfigurationElement elem : clientRuntimeProperties) {
- String clientRuntimeId = elem.getAttribute("clientRuntimeId");
- if (clientRuntimeId != null) {
- ClientRuntimeDescriptor rd = (ClientRuntimeDescriptor)clientRuntimes_.get(clientRuntimeId);
- if (rd!=null) {
- rd.processClientRuntimeProperties(elem);
- }
- }
- }
-
- //Load serviceRuntimeProperties and update service Runtimes
- IConfigurationElement[] serviceRuntimeProperties = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption.ui", "serviceRuntimeProperties");
- for (IConfigurationElement elem : serviceRuntimeProperties) {
- String serviceRuntimeId = elem.getAttribute("serviceRuntimeId");
- if (serviceRuntimeId != null) {
- ServiceRuntimeDescriptor rd = (ServiceRuntimeDescriptor)serviceRuntimes_.get(serviceRuntimeId);
- if (rd!=null) {
- rd.processServiceRuntimeProperties(elem);
- }
- }
- }
- }
-
- /**
- * Updates the list of Web service types with the provided service runtime's contribution of
- * scenario/webServiceImpl combination.
- * @param descriptor
- */
- private void updateWebServiceTypeList(ServiceRuntimeDescriptor descriptor)
- {
- String serviceImplId = descriptor.getServiceImplementationType().getId();
- boolean bottomUp = descriptor.getBottomUp();
- boolean topDown = descriptor.getTopDown();
- if (bottomUp)
- {
- StringBuffer entrybuff = new StringBuffer();
- entrybuff.append(String.valueOf(WebServiceScenario.BOTTOMUP));
- entrybuff.append("/");
- entrybuff.append(serviceImplId);
- String entry = entrybuff.toString();
- if (!webServiceTypesList_.contains(entry))
- {
- webServiceTypesList_.add(entry);
- }
- }
-
- if (topDown)
- {
- StringBuffer entrybuff = new StringBuffer();
- entrybuff.append(String.valueOf(WebServiceScenario.TOPDOWN));
- entrybuff.append("/");
- entrybuff.append(serviceImplId);
- String entry = entrybuff.toString();
- if (!webServiceTypesList_.contains(entry))
- {
- webServiceTypesList_.add(entry);
- }
- }
- }
-
- private void updateWebServiceClientTypeList(ClientRuntimeDescriptor descriptor)
- {
- String clientImplId = descriptor.getClientImplementationType().getId();
- StringBuffer entrybuff = new StringBuffer();
- entrybuff.append(String.valueOf(WebServiceScenario.CLIENT));
- entrybuff.append("/");
- entrybuff.append(clientImplId);
- String entry = entrybuff.toString();
- if (!webServiceClientTypesList_.contains(entry))
- {
- webServiceClientTypesList_.add(entry);
- }
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionUtils2.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionUtils2.java
deleted file mode 100644
index c37dbd1..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionUtils2.java
+++ /dev/null
@@ -1,2289 +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
- * 20060227 124392 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060324 116750 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060427 126780 rsinha@ca.ibm.com - Rupam Kuehner
- * 20070119 159458 mahutch@ca.ibm.com - Mark Hutchinson
- * 20071107 203826 kathy@ca.ibm.com - Kathy Chan
- * 20080326 221364 kathy@ca.ibm.com - Kathy Chan
- * 20080402 225378 makandre@ca.ibm.com - Andrew Mak, Client wizard runtime/server defaulting is not respecting the preference
- * 20080530 234871 makandre@ca.ibm.com - Andrew Mak, Workbench has not been created yet error in cmdline Ant
- * 20080808 243623 mahutch@ca.ibm.com - Mark Hutchinson, Improve server defaulting performance
- * 20091207 295654 kchong@ca.ibm.com - Keith Chong, Project type defaulting is incorrect for a new project
- * 20100929 326549 mahutch@ca.ibm.com - Mark Hutchinson, Web Service Wizard Can Default to invalid project type
- * 20101207 332067 mahutch@ca.ibm.com - Mark Hutchinson, Consider server in web service wizard validation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wsrt;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.IStructuredSelection;
-// This plug-in already references this internal class
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.server.core.FacetUtil;
-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.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.preferences.PersistentServerRuntimeContext;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.TypeSelectionFilter2;
-import org.eclipse.jst.ws.internal.data.LabelsAndIds;
-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.selection.SelectionList;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-import org.eclipse.wst.server.core.IRuntimeType;
-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.ui.ServerUICore;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntime;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntimeChecker;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-/**
- * This class contains numerous utility methods that
- * process the information provided through extension points
- * which are read in WebServiceRuntimeExtensionRegistry2:
- * <ul>
- * <li> org.eclipse.jst.ws.consumption.ui.wsImpl </li>
- * <li> org.eclipse.jst.ws.consumption.ui.wsClientImpl </li>
- * <li> org.eclipse.jst.ws.consumption.ui.runtimes </li>
- * <li> org.eclipse.jst.ws.consumption.ui.serviceRuntimes </li>
- * <li> org.eclipse.jst.ws.consumption.ui.clientRuntimes </li>
- * </ul>
- *
- * to provide answers to common questions regarding which servers,
- * projects, and project types a particular Web service runtime
- * supports.
- * <br/><br/>
- * Teminology used in the javadoc in this class:
- * <ul>
- * <li><b>Web service scenario</b>: One of WebServiceScenario.BOTTOM_UP or WebServiceScenario.TOP_DOWN.</li>
- * <li><b>Web service implementation type</b>: extension to org.eclipse.jst.ws.consumption.ui.wsImpl.
- * The Java representation of this is org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceImpl.</li>
- * <li><b>Web service type</b>: Forward slash separated concatenation of the String representation
- * of a Web service scenario and a Web service implementation type id.
- * For example, "0/org.eclipse.jst.ws.wsImpl.java", represents the bottom up Java bean Web service type.</li>
- * <li><b>Web service client implementation type</b>: extension to org.eclipse.jst.ws.consumption.ui.wsClientImpl.
- * The Java representation of this is org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceClientImpl.</li>
- * <li><b>Web service runtime</b>: extension to org.eclipse.jst.ws.consumption.ui.runtimes.
- * The Java representation of this is org.eclipse.jst.ws.internal.consumption.ui.wsrt.RuntimeDescriptor</li>
- * <li><b>serviceRuntime</b>: extension to org.eclipse.jst.ws.consumption.ui.serviceRuntimes.
- * The Java representation of this is org.eclipse.jst.ws.internal.consumption.ui.wsrt.ServiceRuntimeDescriptor</li>
- * <li><b>clientRuntime</b>: extension to org.eclipse.jst.ws.consumption.ui.clientRuntimes.
- * The Java representation of this is org.eclipse.jst.ws.internal.consumption.ui.wsrt.ClientRuntimeDescriptor</li>
- * <li><b>server type</b>: This is a server tools artifact. You see a list of these when creating a new server
- * in the tool.</li>
- * <li><b>server runtime</b>: This is a server tools artifact. You see a list of these if you go to Preferences,
- * Server > Installed Runtimes in the tool. The Java representation of this is org.eclipse.wst.server.core.IRuntime</li>
- * <li><b>facet runtime</b>: The facet equivalent of a server runtime. The Java representation of this is
- * org.eclipse.wst.common.project.facet.core.runtime.IRuntime. org.eclipse.jst.server.core.FacetUtil
- * provides methods to translate from a server runtime to a facet runtime and vice-versa.</li>
- * </ul>
- */
-public class WebServiceRuntimeExtensionUtils2
-{
- private static WebServiceRuntimeExtensionRegistry2 registry = WebServiceRuntimeExtensionRegistry2.getInstance();
-
- /**
- * Returns the RuntimeDescriptor representing the Web service runtime
- * with an id attribute equal to the provided id
- * @param id
- * @return RuntimeDescriptor representing the Web service runtime
- * with an id attribute equal to the provided id. Returns null
- * if such a RuntimeDescriptor cannot be found.
- */
- public static RuntimeDescriptor getRuntimeById(String id)
- {
- Object result = registry.runtimes_.get(id);
- if (result!=null)
- {
- return (RuntimeDescriptor)result;
- }
- return null;
- }
-
- /**
- * Returns the union of all project types supported by all serviceRuntimes. Used by the
- * ProjectTopology preference page.
- * @return String[] array of template ids. The array may have 0 elements.
- */
- public static String[] getAllServiceProjectTypes()
- {
- ArrayList finalTemplateIdList = new ArrayList();
- Iterator iter = registry.serviceRuntimes_.values().iterator();
-
- //Loop through all the serviceRuntimes
- while (iter.hasNext())
- {
- ServiceRuntimeDescriptor desc = (ServiceRuntimeDescriptor)iter.next();
-
- //Get the templates for this serviceRuntime
- Set templates = FacetMatchCache.getInstance().getTemplatesForServiceRuntime(desc.getId());
-
- //Add the template ids to the list if they have not already been added
- Iterator itr = templates.iterator();
- while (itr.hasNext())
- {
- IFacetedProjectTemplate template = (IFacetedProjectTemplate)itr.next();
- if (!finalTemplateIdList.contains(template.getId()))
- {
- finalTemplateIdList.add(template.getId());
- }
- }
- }
- ensureWebProjectIsFirst(finalTemplateIdList);
- return (String[])finalTemplateIdList.toArray(new String[]{});
- }
-
- private static void ensureWebProjectIsFirst(List finalTemplateIdList)
- {
- // IJ2EEModuleConstants.JST_WEB_TEMPLATE = "template.jst.web"
- int i = finalTemplateIdList.indexOf(IJ2EEModuleConstants.JST_WEB_TEMPLATE);
- // This will ensure that the basic web project is first as default when the workbench
- // is launched on a clean/empty workspace, and not something else contributed by some other extension
- if (i > 0)
- {
- finalTemplateIdList.remove(i);
- finalTemplateIdList.add(0, IJ2EEModuleConstants.JST_WEB_TEMPLATE);
- }
- }
-
- /**
- * Returns the union of all project types supported by all clientRuntimes. Used by the
- * ProjectTopology preference page.
- * @return String[] array of template ids. The array may have 0 elements.
- */
- public static String[] getAllClientProjectTypes()
- {
- ArrayList finalTemplateIdList = new ArrayList();
- Iterator iter = registry.clientRuntimes_.values().iterator();
-
- //Loop through all the clientRuntimes
- while (iter.hasNext())
- {
- ClientRuntimeDescriptor desc = (ClientRuntimeDescriptor)iter.next();
-
- //Get the templates for this clientRuntime
- Set templates = FacetMatchCache.getInstance().getTemplatesForClientRuntime(desc.getId());
-
- //Add the template ids to the list if they have not already been added
- Iterator itr = templates.iterator();
- while (itr.hasNext())
- {
- IFacetedProjectTemplate template = (IFacetedProjectTemplate)itr.next();
- if (!finalTemplateIdList.contains(template.getId()))
- {
- finalTemplateIdList.add(template.getId());
- }
- }
- }
- ensureWebProjectIsFirst(finalTemplateIdList);
- return (String[])finalTemplateIdList.toArray(new String[]{});
- }
-
- /**
- * Returns the label of a Web service runtime given its id
- * @param runtimeId id of a Web service runtime
- * @return String the label of the Web service runtime with an id equal to runtimeId.
- * Returns null if such a Web service runtime cannot be found.
- */
- public static String getRuntimeLabelById(String runtimeId)
- {
- RuntimeDescriptor desc = getRuntimeById(runtimeId);
- if (desc == null)
- return null;
-
- return desc.getLabel();
- }
-
- /**
- * Returns the RuntimeDescriptor corresponding to the Web service runtime with the provided label
- * @param label label of a Web service runtime
- * @return RuntimeDescriptor corresponding to the Web service runtime with the provided label
- * Returns null if such a Web service runtime cannot be found.
- */
- public static RuntimeDescriptor getRuntimeByLabel(String label)
- {
- Iterator iter = registry.runtimes_.values().iterator();
- while (iter.hasNext())
- {
- RuntimeDescriptor descriptor = (RuntimeDescriptor)iter.next();
- if (descriptor!=null) {
- if (label.equals(descriptor.getLabel()))
- return descriptor;
- }
- }
- return null;
- }
-
- /**
- * Returns the label of an server type given its id
- * @param serverFactoryId id of a server type
- * @return String label of the server type with an id equal to serverFactoryId.
- * Returns null if such a server type cannot be found.
- */
- public static String getServerLabelById(String serverFactoryId)
- {
- IServerType serverType = ServerCore.findServerType(serverFactoryId);
- if (serverType == null)
- return null;
-
- if (PlatformUI.isWorkbenchRunning()) {
- String serverLabel = ServerUICore.getLabelProvider().getText(serverType);
- return serverLabel;
- }
- else
- return serverType.getName();
- }
-
- /**
- * Returns the label of an IServer given its id
- * @param instanceId id of an IServer
- * @return String label of the IServer with an id equal to instanceId.
- */
- public static String getServerInstanceLabelFromInstanceId( String instanceId )
- {
- IServer server = ServerCore.findServer( instanceId );
- return server.getName();
- }
-
- /**
- * Returns the union of all server type ids corresponding to the facet runtimes
- * in the provided set.
- * @param facetRuntimes a set containing elements of type {@link IRuntime}.
- * @return an array of IServerType ids. The array may have 0 elements.
- */
- private static String[] getServerFactoryIdsByFacetRuntimes(Set facetRuntimes)
- {
-
- ArrayList supportedServerFactoryIds = new ArrayList();
- String[] serverTypeIds = getAllServerFactoryIdsWithRuntimes();
- Iterator itr = facetRuntimes.iterator();
- while(itr.hasNext())
- {
- IRuntime fRuntime = (IRuntime)itr.next();
- org.eclipse.wst.server.core.IRuntime sRuntime = FacetUtil.getRuntime(fRuntime);
- for (int i=0; i<serverTypeIds.length; i++)
- {
- IServerType serverType = ServerCore.findServerType(serverTypeIds[i]);
- IRuntimeType runtimeType = serverType.getRuntimeType();
- if (runtimeType != null)
- {
- String runtimeTypeId = runtimeType.getId();
- if (sRuntime != null && sRuntime.getRuntimeType() != null && runtimeTypeId.equals(sRuntime.getRuntimeType().getId()))
- {
- supportedServerFactoryIds.add(serverTypeIds[i]);
- }
- }
- }
- }
-
- return (String[])supportedServerFactoryIds.toArray(new String[0]);
-
- //Temporarily return all factory ids with runtimes
- //return getAllServerFactoryIdsWithRuntimes();
- }
-
- //Service-side utilities
- /**
- * Returns a WebServiceImpl given the id of a Web service implementation type.
- * @param id
- * @return WebServiceImpl with the given id
- * Returns null if such a WebServiceImpl cannot be found.
- */
- public static WebServiceImpl getWebServiceImplById(String id)
- {
- Object result = registry.webServiceImpls_.get(id);
- if (result!=null)
- {
- return (WebServiceImpl)result;
- }
- return null;
- }
-
- /**
- * Returns a {@link ServiceRuntimeDescriptor} given the id of a servicRuntime.
- * @param id of a serviceRuntime
- * @return ServiceRuntimeDescriptor with the given id
- * Returns null if such a ServiceRuntimeDescriptor cannot be found.
- */
- public static ServiceRuntimeDescriptor getServiceRuntimeDescriptorById(String id)
- {
- Object result = registry.serviceRuntimes_.get(id);
- if (result!=null)
- {
- return (ServiceRuntimeDescriptor)result;
- }
- return null;
- }
-
- /**
- * Returns the {@link IWebServiceRuntime} of the given serviceRuntime. Extenders provide the fully
- * qualified name of a concrete IWebServiceRuntime in the class attribute of a serviceRuntimes extension.
- * @param serviceRuntimeId id of a serviceRuntime
- * @return IWebServiceRuntime
- */
- public static IWebServiceRuntime getServiceRuntime( String serviceRuntimeId )
- {
- ServiceRuntimeDescriptor descriptor = getServiceRuntimeDescriptorById(serviceRuntimeId);
- IWebServiceRuntime webserviceRuntime = null;
- if (descriptor != null)
- {
- webserviceRuntime = descriptor.getWebServiceRuntime();
- }
-
- return webserviceRuntime;
- }
-
- /**
- * Returns the id of a serviceRuntime that supports the provided Web service type, Web service runtime,
- * server type/server instance (if present), project or project type.
- * @param trs an instance of {@link TypeRuntimeServer} containing a Web service type id, Web service runtime id,
- * server type id and server instance id. The Web service type id and Web service runtime id must be non-null
- * and non-empty. The server type id and server instance id may be null or empty.
- * @param projectName the name of an IProject thay may or mat not exist in the workspace. Must be non-null and
- * non-empty.
- * @param templateId the id of an {@link IFacetedProjectTemplate}. Must be non-null and non-empty if
- * an IProject with the name projectName does not exist in the workspace.
- * @return String id of a serviceRuntime that supports the provided Web service type, Web service runtime,
- * server type/server instance (if present), project or project type. Returns an empty String if no
- * such serviceRuntime could be found.
- */
- public static String getServiceRuntimeId(TypeRuntimeServer trs, String projectName, String templateId)
- {
- boolean serverSelected = (trs.getServerId() != null) && (trs.getServerId().length() > 0);
- //Find the first serviceRuntime that supports the implementation type, runtime, server, and project
- String[] descs = getServiceRuntimesByServiceType(trs.getTypeId(), trs.getServerId());
- for (int i=0; i<descs.length; i++)
- {
- ServiceRuntimeDescriptor desc = getServiceRuntimeDescriptorById(descs[i]);
- if (desc.getRuntime().getId().equals(trs.getRuntimeId()))
- {
- if (serverSelected)
- {
- boolean supportsServer = doesServiceRuntimeSupportServer(desc.getId(), trs.getServerId());
- if (!supportsServer)
- {
- continue;
- }
- }
-
- IProject project = ProjectUtilities.getProject(projectName);
- if (project.exists())
- {
- if (doesServiceRuntimeSupportProject(desc.getId(), projectName))
- {
- return desc.getId();
- }
- }
- else
- {
- //Check if template is supported
- if (doesServiceRuntimeSupportTemplate(desc.getId(), templateId))
- {
- return desc.getId();
- }
- }
- }
- }
-
- return "";
-
- }
-
- /**
- * Returns the Web service scenario from the Web service type.
- * @param typeId must be a String of the format "0/implId"
- * where the digit before the "/" represents the scenario
- * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the Web service implementation type id.
- * @return int scenario (e.g. WebServiceScenario.BOTTOM_UP or WebServiceScenario.TOP_DOWN)
- */
- public static int getScenarioFromTypeId(String typeId)
- {
- return Integer.parseInt(typeId.substring(0,typeId.indexOf("/")));
- }
-
- /**
- * Returns the Web service implemenation type id fron the Web service type id.
- * @param typeId must be a String of the format "0/implId"
- * where the digit before the "/" represents the scenario
- * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the Web service implementation type id.
- * @return String the WebServiceImpl id.
- */
- public static String getWebServiceImplIdFromTypeId(String typeId)
- {
- return typeId.substring(typeId.indexOf("/")+1);
- }
-
- /**
- * Returns the ids of all Web service runtimes that support the given
- * Web service type.
- *
- * @param typeId must be a String of the format "0/implId"
- * where the digit before the "/" represents the scenario
- * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the Web service implementation type id.
- *
- * @return String[] array containing the ids of all Web service runtimes that
- * support the given Web service type. The array may have 0 elements.
- */
- public static String[] getRuntimesByServiceType(String typeId)
- {
- int scenario = getScenarioFromTypeId(typeId);
- String implId = getWebServiceImplIdFromTypeId(typeId);
- ArrayList ids = new ArrayList();
- Iterator iter = registry.serviceRuntimes_.values().iterator();
- while (iter.hasNext())
- {
- ServiceRuntimeDescriptor desc = (ServiceRuntimeDescriptor)iter.next();
- //Check if this serviceRuntime supports the implementation type
- if (desc.getServiceImplementationType().getId().equals(implId))
- {
- switch (scenario)
- {
- case WebServiceScenario.BOTTOMUP:
- if (desc.getBottomUp())
- {
- String runtimeId = desc.getRuntime().getId();
- if (!ids.contains(runtimeId))
- {
- ids.add(runtimeId);
- }
- }
- break;
- case WebServiceScenario.TOPDOWN:
- if (desc.getTopDown())
- {
- String runtimeId = desc.getRuntime().getId();
- if (!ids.contains(runtimeId))
- {
- ids.add(runtimeId);
- }
- }
- break;
- default:
- }
- }
- }
-
- return (String[])ids.toArray(new String[]{});
- }
-
- /**
- * Returns the ids of all serviceRuntimes that support the given
- * Web service type.
- *
- * @param typeId must be a String of the format "0/implId"
- * where the digit before the "/" represents the scenario
- * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the Web service implementation type id.
- *
- * @returns String[] array containing the ids of all serviceRuntimes that
- * support the given Web service type. The array may have 0 elements.
- */
- public static String[] getServiceRuntimesByServiceType(String typeId)
- {
- int scenario = getScenarioFromTypeId(typeId);
- String implId = getWebServiceImplIdFromTypeId(typeId);
- ArrayList ids = new ArrayList();
- Iterator iter = registry.serviceRuntimes_.values().iterator();
- while (iter.hasNext())
- {
- ServiceRuntimeDescriptor desc = (ServiceRuntimeDescriptor)iter.next();
- //Check if this serviceRuntime supports the implementation type
- if (desc.getServiceImplementationType().getId().equals(implId))
- {
- switch (scenario)
- {
- case WebServiceScenario.BOTTOMUP:
- if (desc.getBottomUp())
- {
- String serviceRuntimeId = desc.getId();
- ids.add(serviceRuntimeId);
- }
- break;
- case WebServiceScenario.TOPDOWN:
- if (desc.getTopDown())
- {
- String serviceRuntimeId = desc.getId();
- ids.add(serviceRuntimeId);
- }
- break;
- default:
- }
- }
- }
-
- return (String[])ids.toArray(new String[]{});
- }
-
- /**
- * Returns the ids of all serviceRuntimes that support the given
- * Web service type, with preferred server
- *
- * @param typeId must be a String of the format "0/implId"
- * where the digit before the "/" represents the scenario
- * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the Web service implementation type id.
- *
- * @returns String[] array containing the ids of all serviceRuntimes that
- * support the given Web service type. The array may have 0 elements.
- */
- public static String[] getServiceRuntimesByServiceType(String typeId, String preferredServerFactoryId)
- {
- // PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin
- // .getInstance().getServerRuntimeContext();
- // String preferredRuntimeId = context.getRuntimeId();
- // String preferredServerFactoryId = context.getServerFactoryId();
-
- int scenario = getScenarioFromTypeId(typeId);
- String implId = getWebServiceImplIdFromTypeId(typeId);
- ArrayList ids = new ArrayList();
- ArrayList idsPreferredByServer = new ArrayList();
- Iterator iter = registry.serviceRuntimes_.values().iterator();
- while (iter.hasNext())
- {
- ServiceRuntimeDescriptor desc = (ServiceRuntimeDescriptor)iter.next();
- //Check if this serviceRuntime supports the implementation type
- if (desc.getServiceImplementationType().getId().equals(implId))
- {
- switch (scenario)
- {
- case WebServiceScenario.BOTTOMUP:
- if (desc.getBottomUp())
- {
- String serviceRuntimeId = desc.getId();
- if (desc.getRuntimePreferredServerType() != null && desc.getRuntimePreferredServerType().equals(preferredServerFactoryId))
- idsPreferredByServer.add(serviceRuntimeId);
- else
- ids.add(serviceRuntimeId);
- }
- break;
- case WebServiceScenario.TOPDOWN:
- if (desc.getTopDown())
- {
- String serviceRuntimeId = desc.getId();
- if (desc.getRuntimePreferredServerType() != null && desc.getRuntimePreferredServerType().equals(preferredServerFactoryId))
- idsPreferredByServer.add(serviceRuntimeId);
- else
- ids.add(serviceRuntimeId);
- }
- break;
- default:
- }
- }
- }
- // append preferredRuntime after preferredRuntimeIdsListPreferredByServer
- String[] preferredRuntimeIds = new String[idsPreferredByServer.size()+ids.size()];
- Iterator itr1 = idsPreferredByServer.iterator();
- int preferredRTCounter = 0;
- while (itr1.hasNext()) {
- String runtimeId = (String) itr1.next();
- preferredRuntimeIds[preferredRTCounter++] = runtimeId;
- }
-
- Iterator itr2 = ids.iterator();
-
- while (itr2.hasNext()) {
- String runtimeId = (String) itr2.next();
- preferredRuntimeIds[preferredRTCounter++] = runtimeId;
- }
-
- return preferredRuntimeIds;
- }
-
- /**
- * Returns whether or not the given Web service runtime supports the given
- * Web service type.
- *
- * @param typeId must be a String of the format "0/implId"
- * where the digit before the "/" represents the scenario
- * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the Web service implementation type id.
- *
- * @param runtimeId id of a Web service runtime
- *
- * @return boolean <code>true</code> if the given Web service runtime supports the given
- * Web service type. <code>false</code> otherwise.
- */
- public static boolean isRuntimeSupportedForServiceType(String typeId, String runtimeId)
- {
- String[] serviceRuntimeIds = getServiceRuntimesByServiceType(typeId);
- if (serviceRuntimeIds!=null)
- {
- for (int i=0; i < serviceRuntimeIds.length; i++)
- {
- ServiceRuntimeDescriptor desc = getServiceRuntimeDescriptorById(serviceRuntimeIds[i]);
- if (desc.getRuntime().getId().equals(runtimeId))
- {
- return true;
- }
- }
- }
-
- return false;
- }
-
- /**
- * Returns the ids of all server types that support the given
- * Web service type.
- *
- * @param typeId must be a String of the format "0/implId"
- * where the digit before the "/" represents the scenario
- * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the Web service implementation type id.
- *
- * @returns String[] array containing the ids of all server types that
- * support the given Web service type. The array may have 0 elements.
- */
- public static String[] getServerFactoryIdsByServiceType(String typeId)
- {
- ArrayList serverFactoryIds = new ArrayList();
- String[] srts = getServiceRuntimesByServiceType(typeId);
- if (srts != null)
- {
- for (int i = 0; i < srts.length; i++)
- {
- //Get the runtimes that work for the facets required for this serviceRuntime
- String[] fIds = getServerFactoryIdsByServiceRuntime(srts[i]);
- for (int j=0; j<fIds.length; j++)
- {
- if (!serverFactoryIds.contains(fIds[j]))
- {
- serverFactoryIds.add(fIds[j]);
- }
- }
- }
- }
-
- return (String[])serverFactoryIds.toArray(new String[]{});
-
- //Temporarily return all server type ids.
- //return getAllServerFactoryIdsWithRuntimes();
- }
-
- /**
- * Returns whether or not the given server type supports the given
- * Web service type.
- *
- * @param typeId must be a String of the format "0/implId"
- * where the digit before the "/" represents the scenario
- * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the Web service implementation type id.
- *
- * @param serverFactoryId id of a server type
- *
- * @return boolean <code>true</code> if the given server type supports the given
- * Web service type. <code>false</code> otherwise.
- */
- public static boolean isServerSupportedForChosenServiceType(String typeId, String serverFactoryId)
- {
- String[] fIds = getServerFactoryIdsByServiceType(typeId);
- if (fIds == null)
- {
- return false;
- }
-
- for (int i=0;i<fIds.length;i++)
- {
- if (serverFactoryId.equals(fIds[i]))
- {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * Returns the ids of all server types that support the given
- * serviceRuntime.
- *
- * @param serviceRuntimeId id of a serviceRuntime
- *
- * @returns String[] array containing the ids of all server types that
- * support the given serviceRuntime. The array may have 0 elements.
- */
- public static String[] getServerFactoryIdsByServiceRuntime(String serviceRuntimeId)
- {
- ServiceRuntimeDescriptor desc = getServiceRuntimeDescriptorById(serviceRuntimeId);
- Set facetRuntimes = getRuntimes(desc.getRequiredFacetVersions());
-
- //Temporarily return all server types
- //return getAllServerFactoryIdsWithRuntimes();
- return getServerFactoryIdsByFacetRuntimes(facetRuntimes);
- }
-
-
-
- /**
- * Returns whether or not the given server type supports the given
- * serviceRuntime.
- *
- * @param serviceRuntimeId id of a serviceRuntime
- * @param serverFactoryId id of a server type
- *
- * @return boolean <code>true</code> if the given server type supports the given
- * serviceRuntime. <code>false</code> otherwise.
- */
- public static boolean doesServiceRuntimeSupportServer(String serviceRuntimeId, String serverFactoryId)
- {
- String[] serverIds = getServerFactoryIdsByServiceRuntime(serviceRuntimeId);
- for (int i=0; i<serverIds.length; i++)
- {
- if (serverIds[i].equals(serverFactoryId))
- {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * Returns the labels and ids of all Web service types. Used to populate the Web service type combo box on
- * page 1 of the Web service wizard.
- * @return {@link LabelsAndIds}
- */
- public static LabelsAndIds getServiceTypeLabels()
- {
- LabelsAndIds labelIds = new LabelsAndIds();
- Iterator iterator = registry.webServiceTypesList_.iterator();
- int size = registry.webServiceTypesList_.size();
- String[] labels = new String[size];
- String[] ids = new String[size];
- int index = 0;
-
- labelIds.setLabels_( labels );
- labelIds.setIds_( ids );
-
- while( iterator.hasNext() )
- {
- String wst = (String)iterator.next();
- int scenario = getScenarioFromTypeId(wst);
- String implId = getWebServiceImplIdFromTypeId(wst);
- WebServiceImpl wsimpl = getWebServiceImplById(implId);
- String impllabel = wsimpl.getLabel();
- ids[index] = wst;
- String scenLabel = "";
- switch(scenario)
- {
- case WebServiceScenario.BOTTOMUP:
- scenLabel = NLS.bind(ConsumptionUIMessages.BOTTOMUP_LABEL, new String[0]);
- break;
- case WebServiceScenario.TOPDOWN:
- scenLabel = NLS.bind(ConsumptionUIMessages.TOPDOWN_LABEL, new String[0]);
- break;
- default:
- }
- labels[index] = NLS.bind(ConsumptionUIMessages.COMBINED_TYPE_AND_RUNTIME_LABEL, new String[]{ scenLabel, impllabel });
- index++;
- }
-
- return labelIds;
- }
-
- /**
- * Returns the id of a Web service runtime that supports the given Web service type.
- *
- * @param typeId will be a String of the format "0/implId"
- * where the digit before the "/" represents the scenario
- * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the Web service implementation type id.
- *
- * @return String id of a Web service runtime that supports the given Web service type.
- * Returns null if such a Web service runtime cannot be found.
- */
- public static String getDefaultRuntimeValueFor(String typeId)
- {
- String[] srIds = getServiceRuntimesByServiceType(typeId);
- if (srIds == null)
- {
- return null;
- }
-
- PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
- String preferredRuntimeId = context.getRuntimeId();
-
- String runtimeId;
-
- for (int i = 0; i < srIds.length; i++) {
- runtimeId = getServiceRuntimeDescriptorById(srIds[i]).getRuntime().getId();
- if (runtimeId.equals(preferredRuntimeId)) {
- return runtimeId;
- }
- }
-
- // The preferred runtime does not support typeId. Just return the first service runtime that does support typeId.
- ServiceRuntimeDescriptor desc = getServiceRuntimeDescriptorById(srIds[0]);
- return desc.getRuntime().getId();
- }
-
- /**
- * Returns the id of a Web service client runtime that supports the given Web service client type.
- *
- * @param typeId The client type ID.
- *
- * @return String id of a Web service client runtime that supports the given Web service client type.
- * Returns null if such a Web service client runtime cannot be found.
- */
- public static String getDefaultClientRuntimeValueFor(String typeId)
- {
- String[] crIds = getClientRuntimesByType(typeId);
- if (crIds == null)
- {
- return null;
- }
-
- PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
- String preferredRuntimeId = context.getRuntimeId();
-
- String runtimeId;
-
- for (int i = 0; i < crIds.length; i++) {
- runtimeId = getClientRuntimeDescriptorById(crIds[i]).getRuntime().getId();
- if (runtimeId.equals(preferredRuntimeId)) {
- return runtimeId;
- }
- }
-
- // The preferred runtime does not support typeId. Just return the first service runtime that does support typeId.
- ClientRuntimeDescriptor desc = getClientRuntimeDescriptorById(crIds[0]);
- return desc.getRuntime().getId();
- }
-
- /**
- * Returns the id of a server type that supports the given Web service type.
- * Returns the server type ID from the preference if it supports the typeId.
- *
- * @param typeId will be a String of the format "0/implId"
- * where the digit before the "/" represents the scenario
- * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the Web service implementation type id.
- *
- * @return String id of a id of a server type that supports the given Web service type.
- * Returns null if such a server type cannot be found.
- */
- public static String getDefaultServerValueFor(String typeId)
- {
- String[] fIds = getServerFactoryIdsByServiceType(typeId);
- if (fIds==null || fIds.length==0)
- return null;
-
- PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
- String preferredServerFactoryId = context.getServerFactoryId();
- for (int i = 0; i < fIds.length; i++) {
- String serverTypeId = fIds[i];
- if (serverTypeId.equals(preferredServerFactoryId)) {
- return serverTypeId;
- }
- }
- return fIds[0];
- }
-
- /**
- * Returns the id of a server type that supports the given Web service client type.
- * Returns the server type ID from the preference if it supports the typeId.
- *
- * @param typeId The client type ID.
- *
- * @return String id of a id of a server type that supports the given Web service client type.
- * Returns null if such a server type cannot be found.
- */
- public static String getDefaultClientServerValueFor(String typeId) {
- PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
- String preferredServerFactoryId = context.getServerFactoryId();
- String first = null;//the first server found
- String[] crts = getClientRuntimesByType(typeId);
-
- if (crts != null)
- {
- for (int i = 0; i < crts.length; i++)
- {
- //Get the runtimes that work for the facets required for this serviceRuntime
- String[] fIds = getServerFactoryIdsByClientRuntime(crts[i]);
- for (int j=0; j<fIds.length; j++)
- {
- if (first == null) {
- first = fIds[j];
- }
- if (preferredServerFactoryId.equals(fIds[j])) {
- return fIds[j];//found the preferred one, stop searching and return it
- }
- }
- }
- }
- return first;
- }
-
-
- /**
- * Returns whether or not the given combination of server type, Web service runtime, and Web service type is
- * supported. Used for validation.
- *
- * @param serverFactoryId id of a server type
- * @param runtimeId id of a Web service runtime
- * @param typeId will be a String of the format "0/implId"
- * where the digit before the "/" represents the scenario
- * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the Web service implementation type id.
- *
- * @return boolean <code>true</code> if the given combination of server type, Web service runtime, and Web service type is
- * supported. <code>false</code> otherwise.
- */
- public static boolean isServerRuntimeTypeSupported(String serverFactoryId, String runtimeId, String typeId)
- {
- //Ensure there is at least one serviceRuntime that supports the given type
- String[] serviceRuntimes = getServiceRuntimesByServiceType(typeId);
- if (serviceRuntimes!=null && serviceRuntimes.length>0)
- {
- //Ensure that at least one of these server runtimes supports the given server
- for (int i=0; i<serviceRuntimes.length; i++)
- {
- ServiceRuntimeDescriptor desc = getServiceRuntimeDescriptorById(serviceRuntimes[i]);
- if (desc.getRuntime().getId().equals(runtimeId))
- {
- //Matches the type and the runtime. Check if it matches the server
- Set runtimes = getRuntimes(desc.getRequiredFacetVersions());
- String[] fIds = getServerFactoryIdsByFacetRuntimes(runtimes);
- for (int j=0; j<fIds.length; j++)
- {
- if (fIds[j].equals(serverFactoryId))
- {
- return true;
- }
- }
- }
- }
- }
-
- //didn't find a match. return false.
- return false;
- }
-
- /**
- * Returns an array of Web service type ids that are suitable for the provided selection.
- * Used to default the Web service type combo box on page 1 of the Web service wizard
- * based on the user's initial selection.
- * @param selection
- * @return String[] an array of Web service type ids that are suitable for the provided selection.
- * Returns null if the selection is empty or no suitable Web service types are found.
- */
- public static String[] getWebServiceTypeBySelection(IStructuredSelection selection)
- {
- TypeSelectionFilter2 tsf = new TypeSelectionFilter2();
- String[] wst = tsf.getWebServiceTypeByInitialSelection(selection, registry.webServiceTypesList_);
- return wst == null ? null : wst;
- }
-
- /**
- * Returns whether or not the given server type supports the given Web service runtime
- *
- * @param runtimeId : id of a Web service runtime
- * @param factoryId : id of a server type
- * @return boolean <code>true</code> if the given server type supports the given
- * Web service runtime for the service side. <code>false</code> otherwise.
- */
- public static boolean doesRuntimeSupportServerForServiceSide(String runtimeId, String factoryId)
- {
- //Get all the ServiceRuntimeDescriptors that point to this runtimeId
- Iterator iter = registry.serviceRuntimes_.values().iterator();
- while (iter.hasNext())
- {
- ServiceRuntimeDescriptor desc = (ServiceRuntimeDescriptor)iter.next();
- //check if this serviceRuntime points to runtimeId
- String thisRuntimeId = desc.getRuntime().getId();
- if (thisRuntimeId.equals(runtimeId))
- {
- Set facetRuntimes = getRuntimes(desc.getRequiredFacetVersions());
- String[] fIds = getServerFactoryIdsByFacetRuntimes(facetRuntimes);
- for (int j=0; j<fIds.length; j++)
- {
- if (fIds[j].equals(factoryId))
- {
- return true;
- }
- }
- }
- }
-
- //No serviceRuntime matched. Return false.
- return false;
- }
-
- /**
- * Returns the id of a server type that supports the given Web service runtime
- * on the service side.
- *
- * @param runtimeId id of a Web service runtime
- * @return String the id of a server type that supports the given Web service runtime.
- * Returns null if such a server type cannot be found.
- */
- public static String getFirstSupportedServerForServiceSide(String runtimeId)
- {
- //Get all the ServiceRuntimeDescriptors that point to this runtimeId
- Iterator iter = registry.serviceRuntimes_.values().iterator();
- while (iter.hasNext())
- {
- ServiceRuntimeDescriptor desc = (ServiceRuntimeDescriptor)iter.next();
- //check if this serviceRuntime points to runtimeId
- String thisRuntimeId = desc.getRuntime().getId();
- if (thisRuntimeId.equals(runtimeId))
- {
- Set facetRuntimes = getRuntimes(desc.getRequiredFacetVersions());
- String[] factoryIds = getServerFactoryIdsByFacetRuntimes(facetRuntimes);
- if (factoryIds!=null && factoryIds.length >0)
- {
- return factoryIds[0];
- }
- }
- }
-
- //didn't get a single suitable server type id, return null.
- return null;
- }
-
- /**
- * Returns the names of all projects in the workspace which support the given Web service type
- * and Web service runtime.
- * @param typeId must be a String of the format "0/implId"
- * where the digit before the "/" represents the scenario
- * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the Web service implementation type id.
- * @param runtimeId id of a Web service runtime
- * @return String[] array of project names. The array may have 0 elements.
- */
- public static String[] getProjectsForServiceTypeAndRuntime(String typeId, String runtimeId)
- {
- IProject[] projects = FacetUtils.getAllProjects();
- ArrayList validProjects = new ArrayList();
-
- for (int i=0; i<projects.length;i++)
- {
- if (doesServiceTypeAndRuntimeSupportProject(typeId, runtimeId, projects[i].getName()))
- {
- validProjects.add(projects[i].getName());
- }
- }
-
- return (String[])validProjects.toArray(new String[0]);
-
- }
-
- /**
- * Returns whether or not the given project supports the given Web service type and Web service runtime.
- * @param typeId must be a String of the format "0/implId"
- * where the digit before the "/" represents the scenario
- * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the Web service implementation type id.
- * @param runtimeId id of a Web service runtime
- * @param projectName name of an IProject in the workspace
- * @return boolean <code>true</code> if the project supports the given Web service type and
- * Web service runtime. Returns <code>false</code>
- * <ul>
- * <li>if the project does not support the given Web service type and Web service runtime or</li>
- * <li>if the project does not exist or</li>
- * <li>if projectName is null or empty</li>
- * </ul>
- */
- public static boolean doesServiceTypeAndRuntimeSupportProject(String typeId, String runtimeId, String projectName)
- {
- String[] descs = getServiceRuntimesByServiceType(typeId);
- for (int j = 0; j < descs.length; j++)
- {
- ServiceRuntimeDescriptor desc = getServiceRuntimeDescriptorById(descs[j]);
- if (desc.getRuntime().getId().equals(runtimeId))
- {
- if (doesServiceRuntimeSupportProject(descs[j], projectName))
- {
- return true;
- }
- }
- }
-
- return false;
-
- }
-
- /**
- * Returns whether or not the given project supports the given serviceRuntime.
- * @param serviceRuntimeId id of a serviceRuntime
- * @param projectName name of an IProject in the workspace
- * @return boolean <code>true</code> if the project supports the given
- * serviceRuntime. Returns <code>false</code>
- * <ul>
- * <li>if the project does not support the given serviceRuntime or</li>
- * <li>if the project does not exist or</li>
- * <li>if projectName is null or empty</li>
- * </ul>
- */
- public static boolean doesServiceRuntimeSupportProject(String serviceRuntimeId, String projectName)
- {
- FacetMatcher fm = FacetMatchCache.getInstance().getMatchForProject(false, serviceRuntimeId, projectName);
- if (fm != null)
- {
- return fm.isMatch();
- }
- else
- {
- return false;
- }
- }
-
-
- /**
- * Returns an array of {@link IFacetedProjectTemplate} ids that support the given Web service type
- * and Web service runtime.
- * @param typeId must be a String of the format "0/implId"
- * where the digit before the "/" represents the scenario
- * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the Web service implementation type id.
- * @param runtimeId id of a Web service runtime
- * @return String[] array of {@link IFacetedProjectTemplate} ids that support the given Web service type
- * and Web service runtime. The array may have 0 elements. Returns null if no serviceRuntimes supporting
- * the given Web service type could be found.
- */
- public static String[] getServiceProjectTemplates(String typeId, String runtimeId)
- {
- return getServiceProjectTemplates(typeId, runtimeId, null);
- }
-
- /**
- * Returns an array of {@link IFacetedProjectTemplate} ids that support the given Web service type
- * and Web service runtime and server
- * @param typeId must be a String of the format "0/implId"
- * where the digit before the "/" represents the scenario
- * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the Web service implementation type id.
- * @param runtimeId id of a Web service runtime
- * @param serverId
- * @return String[] array of {@link IFacetedProjectTemplate} ids that support the given Web service type
- * and Web service runtime. The array may have 0 elements. Returns null if no serviceRuntimes supporting
- * the given Web service type could be found.
- */
- public static String[] getServiceProjectTemplates(String typeId, String runtimeId, String serverId)
- {
- String[] srIds = getServiceRuntimesByServiceType(typeId);
- if (srIds == null)
- {
- return null;
- }
- ArrayList templateIdList = new ArrayList();
- for (int i = 0; i < srIds.length; i++)
- {
- if (serverId == null || doesServiceRuntimeSupportServer(srIds[i], serverId)) {
- ServiceRuntimeDescriptor desc = getServiceRuntimeDescriptorById(srIds[i]);
- String thisRuntimeId = desc.getRuntime().getId();
- if (thisRuntimeId.equals(runtimeId))
- {
- //Get the templates for this serviceRuntime
- Set templates = FacetMatchCache.getInstance().getTemplatesForServiceRuntime(desc.getId());
-
- //Add the template ids to the list if they have not already been added
- Iterator itr = templates.iterator();
- while (itr.hasNext())
- {
- IFacetedProjectTemplate template = (IFacetedProjectTemplate)itr.next();
- if (!templateIdList.contains(template.getId()))
- {
- templateIdList.add(template.getId());
- }
- }
- }
- }
-
- }
-
- return (String[])templateIdList.toArray(new String[]{});
- }
-
- /**
- * Returns whether or not the given {@link IFacetedProjectTemplate} supports the given Web service type
- * and Web service runtime.
- * @param typeId must be a String of the format "0/implId"
- * where the digit before the "/" represents the scenario
- * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the Web service implementation type id.
- * @param runtimeId id of a Web service runtime
- * @param templateId id of a {@link IFacetedProjectTemplate}
- * @param serverId id of server
- * @return boolean <code>true</code> if the given {@link IFacetedProjectTemplate} supports the given
- * Web service type and Web service runtime. Returns <code>false</code> otherwise.
- */
- public static boolean doesServiceTypeAndRuntimeSupportTemplate(String typeId, String runtimeId, String templateId, String serverId) {
- String[] srIds = getServiceRuntimesByServiceType(typeId);
- if (srIds == null) {
- return false;
- }
- for (int i = 0; i < srIds.length; i++) {
- if (serverId == null || doesServiceRuntimeSupportServer(srIds[i], serverId)) {
- ServiceRuntimeDescriptor desc = getServiceRuntimeDescriptorById(srIds[i]);
- String thisRuntimeId = desc.getRuntime().getId();
- if (thisRuntimeId.equals(runtimeId)) {
- //Get the templates for this serviceRuntime
- Set templates = FacetMatchCache.getInstance().getTemplatesForServiceRuntime(srIds[i]);
- //Check if any of the template ids match the given one.
- Iterator itr = templates.iterator();
- while (itr.hasNext()) {
- IFacetedProjectTemplate template = (IFacetedProjectTemplate)itr.next();
- if (template.getId().equals(templateId)) {
- return true;
- }
- }
- }
- }
- }
- return false;
- }
-
- /**
- * Returns whether or not the given {@link IFacetedProjectTemplate} supports the given Web service type
- * and Web service runtime.
- * @param typeId must be a String of the format "0/implId"
- * where the digit before the "/" represents the scenario
- * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the Web service implementation type id.
- * @param runtimeId id of a Web service runtime
- * @param templateId id of a {@link IFacetedProjectTemplate}
- * @return boolean <code>true</code> if the given {@link IFacetedProjectTemplate} supports the given
- * Web service type and Web service runtime. Returns <code>false</code> otherwise.
- */
- public static boolean doesServiceTypeAndRuntimeSupportTemplate(String typeId, String runtimeId, String templateId)
- {
- return doesServiceTypeAndRuntimeSupportTemplate(typeId, runtimeId, templateId, null);
- }
-
- /**
- * Returns whether or not the given {@link IFacetedProjectTemplate} supports the given serviceRuntime.
- * @param serviceRuntimeId id of a serviceRuntime
- * @param templateId id of a {@link IFacetedProjectTemplate}
- * @return boolean <code>true</code> if the given {@link IFacetedProjectTemplate} supports the given
- * serviceRuntime. Returns <code>false</code> otherwise.
- */
- public static boolean doesServiceRuntimeSupportTemplate(String serviceRuntimeId, String templateId)
- {
- //Get the templates for this serviceRuntime
- Set templates = FacetMatchCache.getInstance().getTemplatesForServiceRuntime(serviceRuntimeId);
- IFacetedProjectTemplate checkingTemplate = ProjectFacetsManager.getTemplate(templateId);
- return templates.contains(checkingTemplate);
- }
-
- //Client-side utilities
- /**
- * Returns a WebServiceClientImpl given the id of a Web service client implementation type.
- * @param id
- * @return {@link WebServiceClientImpl} with the given id
- * Returns null if such a WebServiceClientImpl cannot be found.
- */
- public static WebServiceClientImpl getWebServiceClientImplById(String id)
- {
- Object result = registry.webServiceClientImpls_.get(id);
- if (result!=null)
- {
- return (WebServiceClientImpl)result;
- }
- return null;
- }
-
- /**
- * Returns a {@link ClientRuntimeDescriptor} given the id of a clientRuntime.
- * @param id of a clientRuntime
- * @return ClientRuntimeDescriptor with the given id
- * Returns null if such a ClientRuntimeDescriptor cannot be found.
- */
- public static ClientRuntimeDescriptor getClientRuntimeDescriptorById(String id)
- {
- Object result = registry.clientRuntimes_.get(id);
- if (result!=null)
- {
- return (ClientRuntimeDescriptor)result;
- }
- return null;
- }
-
- /**
- * Returns the {@link IWebServiceRuntime} of the given clientRuntime. Extenders provide the fully
- * qualified name of a concrete IWebServiceRuntime in the class attribute of a clientRuntimes extension.
- * @param clientRuntimeId id of a clientRuntime
- * @return IWebServiceRuntime
- */
- public static IWebServiceRuntime getClientRuntime( String clientRuntimeId )
- {
- ClientRuntimeDescriptor descriptor = getClientRuntimeDescriptorById(clientRuntimeId);
- IWebServiceRuntime webserviceRuntime = null;
- if (descriptor != null)
- {
- webserviceRuntime = descriptor.getWebServiceRuntime();
- }
-
- return webserviceRuntime;
- }
-
- /**
- * Returns the id of a clientRuntime that supports the provided Web service client implementation type, Web service runtime,
- * server type/server instance (if present), project or project type.
- * @param trs an instance of {@link TypeRuntimeServer} containing a Web service client implementation type id, Web service runtime id,
- * server type id and server instance id. The Web service client implementation type id and Web service runtime id must be non-null
- * and non-empty. The server type id and server instance id may be null or empty.
- * @param projectName the name of an IProject thay may or mat not exist in the workspace. Must be non-null and
- * non-empty.
- * @param templateId the id of an {@link IFacetedProjectTemplate}. Must be non-null and non-empty if
- * an IProject with the name projectName does not exist in the workspace.
- * @return String id of a clientRuntime that supports the provided Web service client implementation type, Web service runtime,
- * server type/server instance (if present), project or project type. Returns an empty String if no
- * such clientRuntime could be found.
- */
- public static String getClientRuntimeId(TypeRuntimeServer trs, String projectName, String templateId)
- {
- boolean serverSelected = (trs.getServerId()!=null) && (trs.getServerId().length()>0);
- //Find the first clientRuntime that supports the implementation type, runtime, server, and project
- String[] descs = getClientRuntimesByType(trs.getTypeId(), trs.getServerId());
- for (int i=0; i<descs.length; i++)
- {
- ClientRuntimeDescriptor desc = getClientRuntimeDescriptorById(descs[i]);
- if (desc.getRuntime().getId().equals(trs.getRuntimeId()))
- {
- if (serverSelected)
- {
- boolean supportsServer = doesClientRuntimeSupportServer(desc.getId(), trs.getServerId());
- if (!supportsServer)
- {
- continue;
- }
- }
-
- IProject project = ProjectUtilities.getProject(projectName);
- if (project.exists())
- {
- if (doesClientRuntimeSupportProject(desc.getId(), projectName))
- {
- return desc.getId();
- }
- }
- else
- {
- //Check if template is supported
- if (doesClientRuntimeSupportTemplate(desc.getId(), templateId))
- {
- return desc.getId();
- }
- }
- }
- }
-
- return "";
-
- }
-
- /**
- * Returns all Web service runtime ids for the client side.
- * @return String[] array of Web service runtime ids for the client side.
- * The array may have 0 elements.
- */
- public static String[] getAllRuntimesForClientSide()
- {
- ArrayList runtimeIds = new ArrayList();
- Iterator iter = registry.clientRuntimes_.values().iterator();
- while (iter.hasNext())
- {
- ClientRuntimeDescriptor desc = (ClientRuntimeDescriptor)iter.next();
- String thisRuntimeId = desc.getRuntime().getId();
- if (!runtimeIds.contains(thisRuntimeId))
- runtimeIds.add(thisRuntimeId);
- }
- return (String[])runtimeIds.toArray(new String[]{});
- }
-
- /**
- * Returns the ids of all clientRuntimes that support the given
- * Web service client implementation type.
- * @param clientImplId id of a Web service client implementation type
- * @returns String[] array containing the ids of all clientRuntimes that
- * support the given Web service client implementation type. The array may have 0 elements.
- */
- public static String[] getClientRuntimesByType(String clientImplId)
- {
- ArrayList ids = new ArrayList();
- Iterator iter = registry.clientRuntimes_.values().iterator();
- while (iter.hasNext())
- {
- ClientRuntimeDescriptor desc = (ClientRuntimeDescriptor)iter.next();
- //Check if this serviceRuntime supports the implementation type
- if (desc.getClientImplementationType().getId().equals(clientImplId))
- {
- ids.add(desc.getId());
- }
- }
-
- return (String[])ids.toArray(new String[]{});
- }
-
- /**
- * Returns the ids of all clientRuntimes that support the given
- * Web service client implementation type and the preferred server
- * @param clientImplId id of a Web service client implementation type
- * @returns String[] array containing the ids of all clientRuntimes that
- * support the given Web service client implementation type. The array may have 0 elements.
- */
- public static String[] getClientRuntimesByType(String clientImplId, String preferredServerFactoryId)
- {
- ArrayList ids = new ArrayList();
- ArrayList idsPreferredByServer = new ArrayList();
- Iterator iter = registry.clientRuntimes_.values().iterator();
- while (iter.hasNext())
- {
- ClientRuntimeDescriptor desc = (ClientRuntimeDescriptor)iter.next();
- //Check if this serviceRuntime supports the implementation type
- if (desc.getClientImplementationType().getId().equals(clientImplId))
- {
- String clientRuntimeId = desc.getId();
- if (desc.getRuntimePreferredServerType() != null && desc.getRuntimePreferredServerType().equals(preferredServerFactoryId)) {
- idsPreferredByServer.add(clientRuntimeId);
- } else {
- ids.add(clientRuntimeId);
- }
- }
- }
-
- // append preferredRuntime after preferredRuntimeIdsListPreferredByServer
- String[] preferredRuntimeIds = new String[idsPreferredByServer.size()+ids.size()];
- Iterator itr1 = idsPreferredByServer.iterator();
- int preferredRTCounter = 0;
- while (itr1.hasNext()) {
- String runtimeId = (String) itr1.next();
- preferredRuntimeIds[preferredRTCounter++] = runtimeId;
- }
-
- Iterator itr2 = ids.iterator();
-
- while (itr2.hasNext()) {
- String runtimeId = (String) itr2.next();
- preferredRuntimeIds[preferredRTCounter++] = runtimeId;
- }
-
- return preferredRuntimeIds;
- }
-
- /**
- * Returns the ids of all Web service runtimes that support the given
- * Web service client implementation type.
- * @param clientImplId id of a Web service client implementation type
- * @return String[] array containing the ids of all Web service runtimes that
- * support the given Web service client implementation type. The array may have 0 elements.
- */
- public static String[] getRuntimesByClientType(String clientImplId)
- {
- ArrayList runtimeIds = new ArrayList();
- Iterator iter = registry.clientRuntimes_.values().iterator();
- while (iter.hasNext())
- {
- ClientRuntimeDescriptor desc = (ClientRuntimeDescriptor)iter.next();
- //Check if this serviceRuntime supports the implementation type
- if (desc.getClientImplementationType().getId().equals(clientImplId))
- {
- if (!runtimeIds.contains(desc.getRuntime().getId()))
- {
- runtimeIds.add(desc.getRuntime().getId());
- }
- }
- }
-
- return (String[])runtimeIds.toArray(new String[]{});
- }
-
- /**
- * Returns whether or not the given Web service runtime supports the given
- * Web service client implementation type.
- * @param clientImplId id of a Web service client implementation type
- * @param runtimeId id of a Web service runtime
- * @return boolean <code>true</code> if the given Web service runtime supports the given
- * Web service client implementation type. <code>false</code> otherwise.
- */
- public static boolean isRuntimeSupportedForClientType(String clientImplId, String runtimeId)
- {
- String[] clientRuntimeIds = getClientRuntimesByType(clientImplId);
- if (clientRuntimeIds!=null)
- {
- for (int i=0; i < clientRuntimeIds.length; i++)
- {
- ClientRuntimeDescriptor desc = getClientRuntimeDescriptorById(clientRuntimeIds[i]);
- if (desc.getRuntime().getId().equals(runtimeId))
- {
- return true;
- }
- }
- }
-
- return false;
- }
-
- /**
- * Returns all server type ids with configured server runtimes.
- * @return String[] array of server type ids. The array may have 0 elements.
- */
- public static String[] getAllClientServerFactoryIds()
- {
- //Iterator iter = registry.clientRuntimes_.values().iterator();
- //while (iter.hasNext())
- //{
- //TODO iterate over all the server types and see if their runtime types have an
- //id that matches the runtime type of any of the runtimes.
- // ClientRuntimeDescriptor desc = (ClientRuntimeDescriptor)iter.next();
- // Set runtimes = getRuntimes(desc.getRequiredFacetVersions());
- // IServerType[] allServerTypes = ServerCore.getServerTypes();
- //}
- //return (String[])serverFactoryIds.toArray(new String[]{});
- //Temporarily return all server types
- return getAllServerFactoryIdsWithRuntimes();
- }
-
- /**
- * Returns the ids of all server types that support the given
- * Web service client implementation type.
- *
- * @param clientImplId id of a Web service client implementation type
- * @return String[] array containing the ids of all server types that
- * support the given Web service client implementation type. The array may have 0 elements.
- */
- public static String[] getServerFactoryIdsByClientType(String clientImplId)
- {
- ArrayList serverFactoryIds = new ArrayList();
- String[] crts = getClientRuntimesByType(clientImplId);
- if (crts != null)
- {
- for (int i = 0; i < crts.length; i++)
- {
- //Get the runtimes that work for the facets required for this serviceRuntime
- String[] fIds = getServerFactoryIdsByClientRuntime(crts[i]);
- for (int j=0; j<fIds.length; j++)
- {
- if (!serverFactoryIds.contains(fIds[j]))
- {
- serverFactoryIds.add(fIds[j]);
- }
- }
- }
- }
-
- return (String[])serverFactoryIds.toArray(new String[]{});
- }
-
- /**
- * Returns whether or not the given server type supports the given
- * Web service client implementation type.
- * @param clientImplId id of a Web service client implementation type
- * @param serverFactoryId id of a server type
- * @return <code>true</code> if the given server type supports the given
- * Web service client implementation type. <code>false</code> otherwise.
- */
- public static boolean isServerSupportedForChosenClientType(String clientImplId, String serverFactoryId)
- {
- String[] fIds = getServerFactoryIdsByClientType(clientImplId);
- if (fIds == null)
- {
- return false;
- }
-
- for (int i=0;i<fIds.length;i++)
- {
- if (serverFactoryId.equals(fIds[i]))
- {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * Returns the ids of all server types that support the given
- * clientRuntime.
- *
- * @param clientRuntimeId id of a clientRuntime
- * @return String[] array containing the ids of all server types that
- * support the given clientRuntime. The array may have 0 elements.
- */
- public static String[] getServerFactoryIdsByClientRuntime(String clientRuntimeId)
- {
- ClientRuntimeDescriptor desc = getClientRuntimeDescriptorById(clientRuntimeId);
- Set facetRuntimes = getRuntimes(desc.getRequiredFacetVersions());
-
- String[] fIds = getServerFactoryIdsByFacetRuntimes(facetRuntimes);
- return fIds;
- }
-
- /**
- * Returns whether or not the given server type supports the given
- * clientRuntime.
- *
- * @param clientRuntimeId id of a clientRuntime
- * @param serverFactoryId id of a server type
- * @return boolean <code>true</code> if the given server type supports the given
- * clientRuntime. <code>false</code> otherwise.
- */
- public static boolean doesClientRuntimeSupportServer(String clientRuntimeId, String serverFactoryId)
- {
- String[] serverIds = getServerFactoryIdsByClientRuntime(clientRuntimeId);
- for (int i=0; i<serverIds.length; i++)
- {
- if (serverIds[i].equals(serverFactoryId))
- {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * Returns whether or not the given server type supports the given Web service runtime
- *
- * @param runtimeId id of a Web service runtime
- * @param factoryId id of a server type
- * @return boolean <code>true</code> if the given server type supports the given
- * Web service runtime for the client side. <code>false</code> otherwise.
- */
- public static boolean doesRuntimeSupportServerForClientSide(String runtimeId, String factoryId)
- {
- //Get all the ClientRuntimeDescriptors that point to this runtimeId
- Iterator iter = registry.clientRuntimes_.values().iterator();
- while (iter.hasNext())
- {
- ClientRuntimeDescriptor desc = (ClientRuntimeDescriptor)iter.next();
- //check if this clientRuntime points to runtimeId
- String thisRuntimeId = desc.getRuntime().getId();
- if (thisRuntimeId.equals(runtimeId))
- {
- Set facetRuntimes = getRuntimes(desc.getRequiredFacetVersions());
- String[] fIds = getServerFactoryIdsByFacetRuntimes(facetRuntimes);
- for (int i=0; i<fIds.length; i++)
- {
- if (fIds[i].equals(factoryId))
- {
- return true;
- }
- }
- }
- }
-
- //No match.
- return false;
- }
-
- /**
- * Returns the id of a server type that supports the given Web service runtime
- * on the client side.
- *
- * @param runtimeId id of a Web service runtime
- * @return String the id of a server type that supports the given Web service runtime
- * on the client side. Returns null if such a server type cannot be found.
- */
- public static String getFirstSupportedServerForClientSide(String runtimeId)
- {
- //Get all the ClientRuntimeDescriptors that point to this runtimeId
- Iterator iter = registry.clientRuntimes_.values().iterator();
- while (iter.hasNext())
- {
- ClientRuntimeDescriptor desc = (ClientRuntimeDescriptor)iter.next();
- //check if this clientRuntime points to runtimeId
- String thisRuntimeId = desc.getRuntime().getId();
- if (thisRuntimeId.equals(runtimeId))
- {
- Set facetRuntimes = getRuntimes(desc.getRequiredFacetVersions());
- String[] factoryIds = getServerFactoryIdsByFacetRuntimes(facetRuntimes);
- if (factoryIds!=null && factoryIds.length >0)
- {
- return factoryIds[0];
- }
- }
- }
-
- //No suitable servers found. Return null.
- return null;
-
- }
-
-
- /**
- * Returns whether or not the given combination of server type, Web service runtime, and
- * Web service client implementation type is supported. Used for validation.
- *
- * @param serverFactoryId id of a server type
- * @param runtimeId id of a Web service runtime
- * @param clientImplId id of a Web service client implementation type
- * @return boolean <code>true</code> if the given combination of server type, Web service runtime,
- * and Web service client implementation type is supported. <code>false</code> otherwise.
- */
- public static boolean isServerClientRuntimeTypeSupported(String serverFactoryId, String runtimeId, String clientImplId)
- {
- //Ensure there is at least one clientRuntime that supports the given type
- String[] clientRuntimes = getClientRuntimesByType(clientImplId);
- if (clientRuntimes!=null && clientRuntimes.length>0)
- {
- //Ensure that at least one of these server runtimes supports the given server
- for (int i=0; i<clientRuntimes.length; i++)
- {
- ClientRuntimeDescriptor desc = getClientRuntimeDescriptorById(clientRuntimes[i]);
- if (desc.getRuntime().getId().equals(runtimeId))
- {
- //Matched type and runtime. Check the server.
- String[] factoryIds = getServerFactoryIdsByClientRuntime(desc.getId());
- for (int j=0; j<factoryIds.length; j++)
- {
- if (factoryIds[j].equals(serverFactoryId))
- {
- return true;
- }
- }
- }
- }
- }
-
- //No match found. return false.
- return false;
- }
-
- /**
- * Returns an array of {@link IFacetedProjectTemplate} ids that support the given Web service client implementation type
- * and Web service runtime and server id
- *
- * @param clientImplId id of a Web service client implementation type
- * @param runtimeId id of a Web service runtime
- * @param serverId
- * @return String[] array of {@link IFacetedProjectTemplate} ids that support the given Web service client implementation type
- * and Web service runtime. The array may have 0 elements. Returns null if no clientRuntimes supporting
- * the given Web service client implementation type could be found.
- */
- public static String[] getClientProjectTemplates(String clientImplId, String runtimeId, String serverId)
- {
- String[] crIds = getClientRuntimesByType(clientImplId);
- if (crIds == null)
- {
- return null;
- }
-
- ArrayList templateIdList = new ArrayList();
- for (int i = 0; i < crIds.length; i++)
- {
- if (serverId == null || doesClientRuntimeSupportServer(crIds[i], serverId)) {
- ClientRuntimeDescriptor desc = getClientRuntimeDescriptorById(crIds[i]);
- String thisRuntimeId = desc.getRuntime().getId();
- if (thisRuntimeId.equals(runtimeId))
- {
- //Get the templates for this clientRuntime
- Set templates = FacetMatchCache.getInstance().getTemplatesForClientRuntime(desc.getId());
-
- //Add the template ids to the list if they have not already been added
- Iterator itr = templates.iterator();
- while (itr.hasNext())
- {
- IFacetedProjectTemplate template = (IFacetedProjectTemplate)itr.next();
- if (!templateIdList.contains(template.getId()))
- {
- templateIdList.add(template.getId());
- }
- }
- }
- }
-
- }
-
- return (String[])templateIdList.toArray(new String[]{});
- }
-
- /**
- * Returns an array of {@link IFacetedProjectTemplate} ids that support the given Web service client implementation type
- * and Web service runtime.
- *
- * @param clientImplId id of a Web service client implementation type
- * @param runtimeId id of a Web service runtime
- * @return String[] array of {@link IFacetedProjectTemplate} ids that support the given Web service client implementation type
- * and Web service runtime. The array may have 0 elements. Returns null if no clientRuntimes supporting
- * the given Web service client implementation type could be found.
- */
- public static String[] getClientProjectTemplates(String clientImplId, String runtimeId)
- {
- return getClientProjectTemplates(clientImplId, runtimeId, null);
- }
-
- /**
- * Returns whether or not the given {@link IFacetedProjectTemplate} supports the given
- * Web service client implementation type and Web service runtime.
- *
- * @param clientImplId id of a Web service client implementation type
- * @param runtimeId id of a Web service runtime
- * @param templateId id of a {@link IFacetedProjectTemplate}
- * @param serverId id of server
- * @return boolean <code>true</code> if the given {@link IFacetedProjectTemplate} supports the given
- * Web service client implementation type and Web service runtime. Returns <code>false</code> otherwise.
- */
- public static boolean doesClientTypeAndRuntimeSupportTemplate(String clientImplId, String runtimeId, String templateId, String serverId) {
- String[] crIds = getClientRuntimesByType(clientImplId);
- if (crIds == null) {
- return false;
- }
-
- for (int i = 0; i < crIds.length; i++) {
- if (serverId == null || doesClientRuntimeSupportServer(crIds[i], serverId)) {
- ClientRuntimeDescriptor desc = getClientRuntimeDescriptorById(crIds[i]);
- String thisRuntimeId = desc.getRuntime().getId();
- if (thisRuntimeId.equals(runtimeId)) {
- //Get the templates for this clientRuntime
- Set templates = FacetMatchCache.getInstance().getTemplatesForClientRuntime(crIds[i]);
-
- //Check if the template ids contains the template we're checking for
- Iterator itr = templates.iterator();
- while (itr.hasNext()) {
- IFacetedProjectTemplate template = (IFacetedProjectTemplate)itr.next();
- if (template.getId().equals(templateId)) {
- return true;
- }
- }
- }
- }
- }
- return false;
- }
-
- /**
- * Returns whether or not the given {@link IFacetedProjectTemplate} supports the given
- * Web service client implementation type and Web service runtime.
- *
- * @param clientImplId id of a Web service client implementation type
- * @param runtimeId id of a Web service runtime
- * @param templateId id of a {@link IFacetedProjectTemplate}
- * @return boolean <code>true</code> if the given {@link IFacetedProjectTemplate} supports the given
- * Web service client implementation type and Web service runtime. Returns <code>false</code> otherwise.
- */
- public static boolean doesClientTypeAndRuntimeSupportTemplate(String clientImplId, String runtimeId, String templateId)
- {
- return doesClientTypeAndRuntimeSupportTemplate(clientImplId, runtimeId, templateId, null);
- }
-
-
- /**
- * Returns whether or not the given {@link IFacetedProjectTemplate}
- * supports the given clientRuntime
- *
- * @param clientRuntimeId id of a clientRuntime
- * @param templateId id of a {@link IFacetedProjectTemplate}
- * @return boolean <code>true</code> if the given {@link IFacetedProjectTemplate} supports the given
- * clientRuntime. Returns <code>false</code> otherwise.
- */
- public static boolean doesClientRuntimeSupportTemplate(String clientRuntimeId, String templateId)
- {
- //Get the templates for this clientRuntime
- Set templates = FacetMatchCache.getInstance().getTemplatesForClientRuntime(clientRuntimeId);
- IFacetedProjectTemplate checkingTemplate = ProjectFacetsManager.getTemplate(templateId);
- return templates.contains(checkingTemplate);
- }
-
- /**
- * Returns the labels and ids of all Web service client implementation types.
- * Used to populate the Web service client type combo box on
- * page 1 of the Web service wizard and Web service client wizard.
- * @return {@link LabelsAndIds}
- */
- public static LabelsAndIds getClientTypeLabels()
- {
-
- LabelsAndIds labelIds = new LabelsAndIds();
- String[] idsArray = new String[0];
- String[] labelsArray = new String[0];
- labelIds.setIds_(idsArray);
- labelIds.setLabels_(labelsArray);
-
- ArrayList ids = new ArrayList();
- ArrayList labels = new ArrayList();
-
- Iterator itr = registry.clientRuntimes_.values().iterator();
- while(itr.hasNext())
- {
- ClientRuntimeDescriptor desc = (ClientRuntimeDescriptor)itr.next();
- WebServiceClientImpl thisClientImpl = desc.getClientImplementationType();
- if (!ids.contains(thisClientImpl.getId()))
- {
- ids.add(thisClientImpl.getId());
- labels.add(thisClientImpl.getLabel());
- }
- }
-
- if (ids.size() > 0)
- {
- idsArray = (String[]) ids.toArray(new String[0]);
- labelsArray = (String[]) labels.toArray(new String[0]);
- labelIds.setIds_(idsArray);
- labelIds.setLabels_(labelsArray);
- }
-
- return labelIds;
-
- }
-
- /**
- * Returns all server type ids for which there are configured server runtimes
- * present in the workspace.
- *
- * @return String[] array of server type ids for which there are configured server runtimes
- * present in the workspace. The array may have 0 elements.
- */
- public static String[] getAllServerFactoryIdsWithRuntimes()
- {
- ArrayList fids = new ArrayList();
- IServerType[] sts = ServerCore.getServerTypes();
- org.eclipse.wst.server.core.IRuntime[] rts = ServerCore.getRuntimes();
-
- for (int i=0; i<sts.length; i++)
- {
- IServerType st = sts[i];
- for (int j=0; j<rts.length; j++)
- {
- if (st == null || st.getRuntimeType() == null) break;
- org.eclipse.wst.server.core.IRuntime rt = rts[j];
- // If the server type has the same runtime type as this runtime, add it to the list
- String serverTypeRuntimeTypeId = st.getRuntimeType().getId();
-
- if (rt != null)
- {
- IRuntimeType rtType = rt.getRuntimeType();
- if (rtType != null)
- {
- String runtimeRuntimeTypeId = rtType.getId();
- if (serverTypeRuntimeTypeId.equals(runtimeRuntimeTypeId))
- {
- if (!fids.contains(st.getId()))
- {
- fids.add(st.getId());
- }
- }
- }
- }
- }
- }
-
- return (String[])fids.toArray(new String[0]);
- }
-
- /**
- * Returns the names of all projects in the workspace which support the given Web service client
- * implementation type and Web service runtime.
- *
- * @param typeId id of a Web service client implementation type
- * @param runtimeId id of a Web service runtime
- * @return String[] array of project names. The array may have 0 elements.
- */
- public static String[] getProjectsForClientTypeAndRuntime(String typeId, String runtimeId)
- {
- IProject[] projects = FacetUtils.getAllProjects();
- ArrayList validProjects = new ArrayList();
-
- for (int i=0; i<projects.length;i++)
- {
- if (doesClientTypeAndRuntimeSupportProject(typeId, runtimeId, projects[i].getName()))
- {
- validProjects.add(projects[i].getName());
- }
- }
-
- return (String[])validProjects.toArray(new String[0]);
-
- }
-
- /**
- * Returns whether or not the given project supports the given Web service client implementation type
- * and Web service runtime.
- *
- * @param typeId id of a Web service client implementation type
- * @param runtimeId id of a Web service runtime
- * @param projectName name of an IProject in the workspace
- * @return boolean <code>true</code> if the project supports the given Web service type and
- * Web service runtime. Returns <code>false</code>
- * <ul>
- * <li>if the project does not support the given Web service client implementation type and
- * Web service runtime or</li>
- * <li>if the project does not exist or</li>
- * <li>if projectName is null or empty</li>
- * </ul>
- */
- public static boolean doesClientTypeAndRuntimeSupportProject(String typeId, String runtimeId, String projectName)
- {
- String[] descs = getClientRuntimesByType(typeId);
- for (int j = 0; j < descs.length; j++)
- {
- ClientRuntimeDescriptor desc = getClientRuntimeDescriptorById(descs[j]);
- if (desc.getRuntime().getId().equals(runtimeId))
- {
- if (doesClientRuntimeSupportProject(descs[j], projectName))
- {
- return true;
- }
- }
- }
-
- return false;
-
-
- }
-
-
- /**
- * Returns whether or not the given project supports the given clientRuntime.
- * @param clientRuntimeId id of a clientRuntime
- * @param projectName name of an IProject in the workspace
- * @return boolean <code>true</code> if the project supports the given
- * clientRuntime. Returns <code>false</code>
- * <ul>
- * <li>if the project does not support the given clientRuntime or</li>
- * <li>if the project does not exist or</li>
- * <li>if projectName is null or empty</li>
- * </ul>
- */
- public static boolean doesClientRuntimeSupportProject(String clientRuntimeId, String projectName)
- {
- FacetMatcher fm = FacetMatchCache.getInstance().getMatchForProject(true, clientRuntimeId, projectName);
- if (fm != null)
- {
- return fm.isMatch();
- }
- else
- {
- return false;
- }
- }
-
- //Utilities used by the ServerRuntimePreferencePage
-
- private static SelectionListChoices serverToRuntimeToJ2EE_;
- private static Hashtable serverFactoryIdByLabel_;
- private static Hashtable runtimeIdByLabel_;
-
- /**
- * Returns the {@link SelectionListChoices} data structure representing the
- * server type > Web service runtime > J2EE cascading lists .
- * {@link SelectionListChoices} is a data structure which is like a cascading
- * set of lists useful for populating a group of combo boxes in which the
- * selection in a given combo box determines the list of items used to populate
- * the combo box below it. The Server Runtime preference page contains two combo
- * boxes: one for server types and, below it, one for Web service runtimes.
- * The server type combo box is meant to contain the list of all available server types
- * that support at least one Web service runtime on either the client or service side.
- * The Web service runtime combo box is meant to contain the subset of Web service runtimes
- * supported by the server type selected in the server type combo box.
- * The SelectionListChoices returned by this method has three lists: server types, Web service runtimes,
- * and J2EE levels. The first two lists correspond to the combo boxes on the preference
- * page and are used to populate them. The J2EE levels list is a historical remnant from
- * when J2EE levels used to be displayed on the preference page. It remains in this
- * data structure with some hard-coded values but is not rendered to the user.
- *
- * @return SelectionListChoices representing the server type > Web service runtime > J2EE cascading lists
- */
- public static SelectionListChoices getServerToRuntimeToJ2EE()
- {
- if (serverToRuntimeToJ2EE_!=null)
- {
- return serverToRuntimeToJ2EE_;
- }
-
- //TODO (see bug 116025): Instead of all server type ids, we should be calculating the set of server
- //types that support at least one Web service runtime on either the client or service side.
- //Getting all server types for now.
- String[] servers = getAllServerFactoryIds();
-
- SelectionList serversList = new SelectionList(servers, 0);
- Vector choices = new Vector();
- for (int i=0; i<servers.length; i++)
- {
- choices.add(getRuntimeChoices(servers[i]));
- }
- serverToRuntimeToJ2EE_ = new SelectionListChoices(serversList, choices);
- return serverToRuntimeToJ2EE_;
-
- }
-
- private static SelectionListChoices getRuntimeChoices(String serverFactoryId)
- {
- //TODO (see bug 116025): Instead of all Web service runtimes, we should be
- //calculating the subset of Web service runtimes supported by the server type
- //with id equal to serverFactoryId. Getting all the Web service runtimes for now.
- Set runtimes = registry.runtimes_.keySet();
- Iterator itr = registry.runtimes_.keySet().iterator();
- String[] runtimeIds = new String[runtimes.size()];
- int i = 0;
- while (itr.hasNext())
- {
- String runtimeId = (String)itr.next();
- runtimeIds[i] = runtimeId;
- i++;
- }
-
- SelectionList runtimesList = new SelectionList(runtimeIds, 0);
- Vector choices = new Vector();
- for (int j=0; j<runtimeIds.length; j++)
- {
- choices.add(getJ2EEChoices(runtimeIds[j]));
- }
- return new SelectionListChoices(runtimesList, choices);
- }
-
- private static SelectionListChoices getJ2EEChoices(String runtimeId)
- {
- //J2EE levels have been removed from the Server Runtime preference page.
- //Return some hard coded values. These will not be rendered on the preference page.
- String[] j2eeVersions = new String[]{"13", "14"};
- SelectionList j2eeVersionsList = new SelectionList(j2eeVersions, 0);
- return new SelectionListChoices(j2eeVersionsList, null);
- }
-
- private static String[] getAllServerFactoryIds()
- {
- //TODO (see bug 116025): Instead of all server type ids, we should be calculating the set of server
- //types that support at least one Web service runtime on either the client or service side.
- //Return all server type ids for now.
- ArrayList ids = new ArrayList();
- if (serverFactoryIdByLabel_ == null)
- {
- serverFactoryIdByLabel_ = new Hashtable();
- IServerType[] serverTypes = ServerCore.getServerTypes();
- for (int i=0; i<serverTypes.length; i++)
- {
- String id = serverTypes[i].getId();
- String label = getServerLabelById(id);
- serverFactoryIdByLabel_.put(label, id);
- ids.add(id);
- }
- }
- else
- {
- Iterator fids = serverFactoryIdByLabel_.values().iterator();
- while (fids.hasNext())
- {
- String fid = (String)fids.next();
- ids.add(fid);
- }
- }
-
- if (ids.size() > 0)
- {
- String[] serverFactoryIds = (String[])ids.toArray(new String[0]);
- return serverFactoryIds;
- }
-
- return null;
- }
-
- /**
- * Returns a server type id given the server type's label
- * @param label server type label
- * @return server type id or null if no server type with the given
- * label is found.
- */
- public static String getServerFactoryId(String label)
- {
- if (label==null || label.length()==0)
- return null;
-
- if (serverFactoryIdByLabel_ == null)
- {
- getAllServerFactoryIds();
- }
-
- if (serverFactoryIdByLabel_.containsKey(label))
- {
- return (String)serverFactoryIdByLabel_.get(label);
- }
- else
- {
- return null;
- }
- }
-
- /**
- * Returns a Web service runtime's id given its label
- * @param label Web service runtime label
- * @return Web service runtime id or null if no
- * Web service runtime with the given label is found.
- */
- public static String getRuntimeId(String label)
- {
-
- if (label==null || label.length()==0)
- return null;
-
- if (runtimeIdByLabel_ == null)
- {
- runtimeIdByLabel_ = new Hashtable();
- Iterator iter = registry.runtimes_.values().iterator();
- while (iter.hasNext())
- {
- RuntimeDescriptor desc = (RuntimeDescriptor)iter.next();
- runtimeIdByLabel_.put(desc.getLabel(), desc.getId());
- }
- }
-
- return (String)runtimeIdByLabel_.get(label);
- }
-
-
- /**
- * Returns a set of facet runtimes that support the given
- * required facet versions.
- * @param requiredFacetVersions an array containing elements of type {@link RequiredFacetVersion}
- * @return Set set of facet runtimes that support the given required facet versions.
- * (element type: {@link IRuntime})
- */
- private static Set getRuntimes(RequiredFacetVersion[] requiredFacetVersions)
- {
- return FacetUtils.getRuntimes(requiredFacetVersions);
- }
-
-/**
- * Get the service runtime checker class
- * @param serviceRuntimeId service runtime ID
- * @return
- */
- public static IWebServiceRuntimeChecker getServiceRuntimeChecker(String serviceRuntimeId) {
- return getServiceRuntimeDescriptorById(serviceRuntimeId).getServiceRuntimeChecker();
-
- }
-
-/**
- * Get the client runtime checker class
- * @param clientRuntimeId
- * @return
- */
-public static IWebServiceRuntimeChecker getClientRuntimeChecker(String clientRuntimeId) {
- return getClientRuntimeDescriptorById(clientRuntimeId).getClientRuntimeChecker();
-
- }
-
-/**
- * Get the service runtime preferred server type
- * @param serviceRuntimeId service runtime ID
- * @return
- */
- public static String getServicePreferredServerType(String serviceRuntimeId) {
- return getServiceRuntimeDescriptorById(serviceRuntimeId).getRuntimePreferredServerType();
-
- }
-
-/**
- * Get the client runtime preferred server type
- * @param clientRuntimeId
- * @return
- */
-public static String getClientPreferredServerType(String clientRuntimeId) {
- return getClientRuntimeDescriptorById(clientRuntimeId).getRuntimePreferredServerType();
-
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeInfo.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeInfo.java
deleted file mode 100644
index a8e2562..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeInfo.java
+++ /dev/null
@@ -1,210 +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
- * -------- -------- -----------------------------------------------------------
- * 20060216 127138 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.wsrt;
-
-import java.util.Hashtable;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntime;
-import com.ibm.icu.util.StringTokenizer;
-
-
-public class WebServiceRuntimeInfo {
-
- private IConfigurationElement elem_;
- private Hashtable allServiceTypes_;
- private Hashtable allClientTypes_;
-
- private String id;
- private String label;
- private ServiceType[] serviceTypes;
- private ClientType[] clientTypes;
- private java.lang.String[] servletLevels;
- private java.lang.String[] j2eeLevels;
- private java.lang.String[] runtimeIds;
- private java.lang.String[] serverFactoryIds;
- private String className;
- private IWebServiceRuntime webServiceRuntime_;
-
- public WebServiceRuntimeInfo(IConfigurationElement elem_, Hashtable allServiceTypes_, Hashtable allClientTypes_)
- {
- super();
- this.elem_ = elem_;
- this.allServiceTypes_ = allServiceTypes_;
- this.allClientTypes_ = allClientTypes_;
- }
-
- public String getClassName()
- {
- if (className==null)
- {
- className=elem_.getAttribute("class");
- }
- return className;
- }
-
-
- public ClientType[] getClientTypes()
- {
- if (clientTypes==null)
- {
- String attr = elem_.getAttribute("clientTypes");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- clientTypes = new ClientType[size];
- for (int i = 0; i < clientTypes.length; i++)
- {
- String ctid = st.nextToken();
- clientTypes[i] = (ClientType)allClientTypes_.get(ctid);
- }
- }
- }
- return clientTypes;
- }
-
-
- public String getId()
- {
- if (id==null)
- {
- id = elem_.getAttribute("id");
- }
- return id;
- }
-
-
- public String getLabel()
- {
- if (label==null)
- {
- label = elem_.getAttribute("label");
- }
- return label;
- }
-
-
- public java.lang.String[] getJ2eeLevels()
- {
- if (j2eeLevels == null)
- {
- String attr = elem_.getAttribute("j2eeLevels");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- j2eeLevels = new String[size];
- for (int i = 0; i < j2eeLevels.length; i++)
- j2eeLevels[i] = st.nextToken();
- }
- }
-
- return j2eeLevels;
- }
-
-
- public java.lang.String[] getRuntimeIds()
- {
- if (runtimeIds == null)
- {
- String attr = elem_.getAttribute("runtimes");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- runtimeIds = new String[size];
- for (int i = 0; i < runtimeIds.length; i++)
- runtimeIds[i] = st.nextToken();
- }
- }
-
- return runtimeIds;
- }
-
-
- public java.lang.String[] getServerFactoryIds()
- {
- if (serverFactoryIds == null)
- {
- String attr = elem_.getAttribute("servers");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- serverFactoryIds = new String[size];
- for (int i = 0; i < serverFactoryIds.length; i++)
- serverFactoryIds[i] = st.nextToken();
- }
- }
- return serverFactoryIds;
- }
-
-
- public ServiceType[] getServiceTypes()
- {
- if (serviceTypes==null)
- {
- String attr = elem_.getAttribute("serviceTypes");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- serviceTypes = new ServiceType[size];
- for (int i = 0; i < serviceTypes.length; i++)
- {
- String ctid = st.nextToken();
- serviceTypes[i] = (ServiceType)allServiceTypes_.get(ctid);
- }
- }
- }
- return serviceTypes;
- }
-
-
- public java.lang.String[] getServletLevels()
- {
- if (servletLevels==null)
- {
- String attr = elem_.getAttribute("servletLevels");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- servletLevels = new String[size];
- for (int i = 0; i < servletLevels.length; i++)
- servletLevels[i] = st.nextToken();
- }
- }
- return servletLevels;
- }
-
- public IWebServiceRuntime getWebServiceRuntime()
- {
- if (webServiceRuntime_ == null)
- {
- try
- {
- webServiceRuntime_ = (IWebServiceRuntime)elem_.createExecutableExtension("class");
- }
- catch(CoreException ce)
- {
- ce.printStackTrace();
- }
- }
-
- return webServiceRuntime_;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/.classpath b/bundles/org.eclipse.jst.ws.consumption/.classpath
deleted file mode 100644
index 185c898..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="webserviceutils"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.consumption/.cvsignore b/bundles/org.eclipse.jst.ws.consumption/.cvsignore
deleted file mode 100644
index 48e90ea..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/.cvsignore
+++ /dev/null
@@ -1,10 +0,0 @@
-bin
-build.xml
-temp.folder
-webserviceutils.jar
-wsc.jar
-webserviceutilssrc.zip
-@dot
-wscsrc.zip
-javaCompiler.webserviceutils.jar.args
-javaCompiler.wsc.jar.args
diff --git a/bundles/org.eclipse.jst.ws.consumption/.project b/bundles/org.eclipse.jst.ws.consumption/.project
deleted file mode 100644
index 0758941..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.consumption</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.consumption/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.consumption/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 1426bed..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Mon Jan 30 10:35:51 EST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-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=warning
-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=warning
-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.3
diff --git a/bundles/org.eclipse.jst.ws.consumption/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.jst.ws.consumption/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 8135507..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 30 10:41:25 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.consumption/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF
deleted file mode 100644
index d9a100c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,63 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.consumption; singleton:=true
-Bundle-Version: 1.0.550.qualifier
-Bundle-ClassPath: .,
- webserviceutils.jar
-Bundle-Activator: org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.consumption;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.codegen;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.codegen.bean;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitoractions;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.command.common;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.common;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.datamodel.validate;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.datamodel.wsdlmodel;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.fragments;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.plugin;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.sampleapp.codegen;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.sampleapp.command;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.sampleapp.common;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.wsfinder;x-internal:=true,
- org.eclipse.jst.ws.util
-Import-Package: com.ibm.icu.util; version="3.8"
-Require-Bundle: 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.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.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.xsd;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.ws;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.jdt.launching;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.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.ws.parser;bundle-version="[1.0.100,1.1.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.wst.internet.monitor.core;bundle-version="[1.0.102,1.1.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)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.web;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,2.0.0)",
- javax.wsdl;bundle-version="[1.5.0,1.6.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.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.jst.server.core;bundle-version="[1.0.102,2.0.0)",
- org.eclipse.emf.codegen;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.core.commands;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.jst.common.project.facet.core;bundle-version="[1.4.100,2.0.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.jst.ws.consumption/about.html b/bundles/org.eclipse.jst.ws.consumption/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/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.consumption/build.properties b/bundles/org.eclipse.jst.ws.consumption/build.properties
deleted file mode 100644
index b9740ed..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/build.properties
+++ /dev/null
@@ -1,28 +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
-# -------- -------- -----------------------------------------------------------
-# 20070501 184505 kathy@ca.ibm.com - Kathy Chan
-###############################################################################
-source.webserviceutils.jar = webserviceutils/
-jars.compile.order = .,\
- webserviceutils.jar
-bin.includes = plugin.properties,\
- plugin.xml,\
- webserviceutils.jar,\
- META-INF/,\
- about.html,\
- .
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=256033
-# jars.extra.classpath = ../javax.xml.soap/lib/saaj.jar
-extra.javax.xml.soap=platform:/plugins/javax.xml.soap/lib/saaj.jar
-output.. = bin/
-source.. = src/
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/plugin.properties b/bundles/org.eclipse.jst.ws.consumption/plugin.properties
deleted file mode 100644
index 79e0cab..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/plugin.properties
+++ /dev/null
@@ -1,23 +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
-# -------- -------- -----------------------------------------------------------
-# 20090302 242635 mahutch@ca.ibm.com - Mark Hutchinson, Remove unnecessary UI dependencies from org.eclipse.jst.ws.consumption
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services Consumption
-PLUGIN_PROVIDER=Eclipse Web Tools Platform
-XP_WSFINDER=org.eclipse.jst.ws.internal.consumption.wsfinder
-XP_WEB_SERVICE_START_SERVER_TYPE=WebServiceStartServerType
-XP_SERVER_DEFAULTER=Server Defaulter
-XP_FACET_OP_DELEGATE=Facet Operation Delegate
diff --git a/bundles/org.eclipse.jst.ws.consumption/plugin.xml b/bundles/org.eclipse.jst.ws.consumption/plugin.xml
deleted file mode 100644
index da2c8dd..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/plugin.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
- <!-- The following extension point is internal and likely to be removed in a future release. -->
- <extension-point
- id="wsfinder"
- name="%XP_WSFINDER"/>
-
- <!-- The following extension point is internal and likely to be removed in a future release. -->
- <extension-point
- id="webServiceStartServerType"
- name="%XP_WEB_SERVICE_START_SERVER_TYPE"/>
-
- <!-- The following extension point is internal and likely to be removed in a future release. -->
- <extension-point
- id="serverDefaulter"
- name="%XP_SERVER_DEFAULTER"/>
-
- <!-- The following extension point is internal and likely to be removed in a future release. -->
- <extension-point id="internalFacetOperationDelegate"
- name="%XP_FACET_OP_DELEGATE"
- schema="schema/facetOperationDelegate.exsd"/>
-
-
- <extension
- point="org.eclipse.jst.ws.consumption.webServiceStartServerType">
- <webServiceStartServerType
- factoryId="org.eclipse.jst.server.tomcat.32"
- class="org.eclipse.jst.ws.internal.consumption.command.common.StartTomcatServer"
- id="SERVER_ID_TOMCAT32_LOCAL">
- </webServiceStartServerType>
- <webServiceStartServerType
- factoryId="org.eclipse.jst.server.tomcat.40"
- class="org.eclipse.jst.ws.internal.consumption.command.common.StartTomcatServer"
- id="SERVER_ID_TOMCAT40_LOCAL">
- </webServiceStartServerType>
- <webServiceStartServerType
- factoryId="org.eclipse.jst.server.tomcat.41"
- class="org.eclipse.jst.ws.internal.consumption.command.common.StartTomcatServer"
- id="SERVER_ID_TOMCAT41_LOCAL">
- </webServiceStartServerType>
- <webServiceStartServerType
- factoryId="org.eclipse.jst.server.tomcat.50"
- class="org.eclipse.jst.ws.internal.consumption.command.common.StartTomcatServer"
- id="SERVER_ID_TOMCAT50_LOCAL">
- </webServiceStartServerType>
- <webServiceStartServerType
- factoryId="org.eclipse.jst.server.geronimo.10"
- class="org.eclipse.jst.ws.internal.consumption.command.common.StartTomcatServer"
- id="SERVER_ID_GERONIMO10_LOCAL">
- </webServiceStartServerType>
- </extension>
-
-
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.consumption/schema/facetOperationDelegate.exsd b/bundles/org.eclipse.jst.ws.consumption/schema/facetOperationDelegate.exsd
deleted file mode 100644
index 45b3400..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/schema/facetOperationDelegate.exsd
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.consumption" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appinfo>
- <meta.schema plugin="org.eclipse.jst.ws.consumption" id="internalFacetOperationDelegate" name="Facet Operation Delegate"/>
- </appinfo>
- <documentation>
- <b>Internal Extension Point:</b> This internal extension point allows an IFacetOperationDelegate to be plugged in that is delegated some facet operations. <b>Do not use this extension point.</b>
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <appinfo>
- <meta.element internal="true" />
- </appinfo>
- </annotation>
- <complexType>
- <sequence>
- <element ref="FacetOperationDelegate"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appinfo>
- <meta.attribute translatable="true"/>
- </appinfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="FacetOperationDelegate">
- <annotation>
- <documentation>
- This element specifies the FacetOperationDelegate
- </documentation>
- </annotation>
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
- Class that provides the implementation of IFacetOperationDelegate
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appinfo>
- <meta.section type="since"/>
- </appinfo>
- <documentation>
- WTP 3.1
- </documentation>
- </annotation>
-
-
-
-
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/Consumption.properties b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/Consumption.properties
deleted file mode 100644
index 60f08ba..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/Consumption.properties
+++ /dev/null
@@ -1,200 +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
-# -------- -------- -----------------------------------------------------------
-# 20060217 126757 rsinha@ca.ibm.com - Rupam Kuehner
-# 20060401 128827 kathy@ca.ibm.com - Kathy Chan
-# 20070509 182274 kathy@ca.ibm.com - Kathy Chan
-# 20080331 225032 makandre@ca.ibm.com - Andrew Mak, Error msg references renamed category
-# 20080402 222409 kathy@ca.ibm.com - Kathy Chan
-# 20080402 224433 kathy@ca.ibm.com - Kathy Chan, Properties file change
-# 20080505 182167 makandre@ca.ibm.com - Andrew Mak, Warning not issued when non-instantiable class is bypassed in sampe JSPs
-###############################################################################
-
-#
-# Sample messages
-#
-MSG_ERROR_JTS_PROXY_HAS_NO_METHODS=IWAB0179E Unable to create a sample to the proxy because the proxy does not contain methods.
-MSG_ERROR_JTS_PROXY_HAS_NO_DEFAULT=IWAB0180E Unable to create a sample to the proxy because the proxy is not a bean (i.e.. the sample does not have public default constructor).
-MSG_ERROR_JTS_NO_PROXY_METHODS_PROCESSED=IWAB0181E Unable to create a sample to the proxy because none of the methods in the proxy were processed.
-MSG_WARN_JTS_UNSUPPORTED_TYPE=IWAB0182W The Sample JSP client does not support the following type: {0}
-MSG_WARN_JTS_UNSUPPORTED_INDEXED_PROPERTIES=IWAB0187W The Sample JSP client does not support Indexed properties: {0}
-MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_ARRAYS=IWAB0237W The Sample JSP client does not support arrays: {0}
-MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_INPUTS=IWAB0124W The Sample JSP client does not support input parameters that are not beans: {0}
-MSG_ERROR_JTS_CYCLIC_BEAN=IWAB0188E The Sample JSP client does not support beans containing attributes that reference the beans: {0}
-MSG_WARN_JTS_PROXY_METHODS_OMITTED=IWAB0189W The Sample JSP client omitted some methods because they contained unsupported types.
-MSG_ERROR_SAMPLE_CREATION_CANCELED=IWAB0021E Sample creation was canceled
-MSG_WARN_UNABLE_TO_FIND_PROXY=IWAB0022W The Proxy Resource cound not not be found.
-MSG_ERROR_JTS_JSP_GEN=Error in generating sample JSP
-MSG_WARN_JTS_NON_INSTANTIABLE_TYPE=The input type {0} is a non-instantiable type and will be omitted from the sample JSP. Continue with sample JSP generation?
-
-# Not used
-#MSG_ERROR_CANNOT_CREATE_COMPONENT=The Web service wizard cannot automatically create component "{0}". Cancel the wizard and create the component manually.
-
-
-#
-# Filters
-#
-FILTER_MSG_ERROR_NULL_OBJECT=IWAB0097E No object has been provided.
-FILTER_MSG_ERROR_NOT_FILE=IWAB0098E The object "{0}" is not a file.
-FILTER_MSG_ERROR_NOT_FOLDER=IWAB0137E The object "{0}" is not a folder.
-
-JAVA_FILTER_NAME=Java files
-JAVA_FILTER_DESC=Files with names ending in ".java" or ".class".
-JAVA_FILTER_MSG_ERROR_WRONG_EXTENSION=IWAB0102E The file "{0}" does not end in ".java" or ".class".
-
-WSDL_FILTER_NAME=WSDL files
-WSDL_FILTER_DESC=Files with names ending in ".wsdl".
-WSDL_FILTER_MSG_ERROR_WRONG_EXTENSION=IWAB0103E The file "{0}" does not end in ".wsdl".
-
-ISD_FILTER_NAME=ISD files
-ISD_FILTER_DESC=Files with names ending in ".isd".
-ISD_FILTER_MSG_ERROR_WRONG_EXTENSION=IWAB0095E The file "{0}" does not end in ".isd".
-
-PROPERTIES_FILTER_NAME=Properties files
-PROPERTIES_FILTER_DESC=Files with names ending in ".properties"
-PROPERTIES_FILTER_MSG_ERROR_WRONG_EXTENSION= The file "{0}" does not end in ".properties".
-
-FOLDER_FILTER_NAME=Folders
-FOLDER_FILTER_DESC=Folders.
-
-#
-# Deployment status
-#
-PROGRESS_INFO_COPY_WEBSERVICE_UTILS=IWAB0023I Copying the webservice utilities.
-PROGRESS_INFO_COPYING_FILE=IWAB0197I Copying SOAP run-time file.
-PROGRESS_INFO_START_WEB_PROJECT=IWAB0198I Starting Web project.
-PROGRESS_INFO_PUBLISHING_SERVER=IWAB0199I Publishing server.
-PROGRESS_INFO_STARTING_SERVER=IWAB0200I Starting server.
-PROGRESS_INFO_PUBLISH_WEB_PROJECT=IWAB0205I Publishing Web project.
-
-
-#
-# Deployment messages
-#
-MSG_ERROR_PROJECT_NOT_FOUND=IWAB0207E Web project was not found.
-MSG_ERROR_FILECOPY_WEBSERVICE_UTILS=IWAB0024E Error in copying Webservice Utility file.
-MSG_ERROR_INSTANCE_NOT_FOUND=IWAB0212E Server was not found.
-MSG_ERROR_SERVER=IWAB0213E Error in starting server.
-MSG_ERROR_PUBLISH=IWAB0217E Error in publishing Web project.
-MSG_ERROR_ADD_MODULE=Error occured when adding the module, {0}, to the server
-
-MSG_ERROR_CREATE_SERVER=IWAB0025E Unable to create server.
-MSG_ERROR_STUB_ONLY=Unable to create server because only stub runtimes are available for the {0} server type. Go to Window > Preferences. Select Server > Runtime Environments to install a non-stub runtime.
-
-#
-# EJB messages
-# 4 unused messages in jst.ws and wst.ws
-TASK_LABEL_CREATE_EJB_PROJECT=CreateEJBProjectTask
-TASK_DESC_CREATE_EJB_PROJECT=Create an EJB Project.
-MSG_ERROR_CANNOT_CREATE_EJB_PROJECT=IWAB0432E Unable to create EJB project.
-MSG_ERROR_CANNOT_CREATE_APP_CLIENT_PROJECT=IWAB0026E Unable to create application client project {0}.
-
-MSG_ERROR_CANNOT_CREATE_JAVA_PROJECT=IWAB0027E Unable to create Java project {0}.
-MSG_ERROR_CANNOT_CREATE_EAR_PROJECT=IWAB0062E Unable to create EAR project {0}.
-
-#
-# Validator task descriptions
-#
-TASK_LABEL_WEBSERVICE_DISABLE_VALIDATION=Disable validators.
-TASK_DESC_WEBSERVICE_DISABLE_VALIDATION=Temporarily disabling validators.
-TASK_LABEL_WEBSERVICE_RESTORE_VALIDATION=Restore validators.
-TASK_DESC_WEBSERVICE_RESTORE_VALIDATION=Restoring states of validators.
-TASK_LABEL_WEBSERVICE_DISABLE_BUILD=Disable auto build.
-TASK_DESC_WEBSERVICE_DISABLE_BUILD=Temporarily disabling auto build.
-TASK_LABEL_WEBSERVICE_RESTORE_BUILD=Restore auto build.
-TASK_DESC_WEBSERVICE_RESTORE_BUILD=Restoring state of auto build.
-
-#
-# MISC
-#
-MSG_ERROR_WEB_PROJECT_CREATE=IWAB0310E An error occurred during creation of the Web Project.
-
-#
-# CheckProjectOKCommand
-#
-MSG_ERROR_SERVER_VIEW_OPEN=IWAB0126E The server configuration editor is open for {0}. Close it and restart the wizard.
-
-
-#
-# DetectNonJavaCharsCommand
-#
-MSG_WARN_JAVA_METHOD_START_WITH_UPPER_CASE=IWAB0129W Java method {0} in class {1} starts with an upper case letter. Method names should begin with lower case letters.
-MSG_WARN_METHOD_NAME_INVALID=IWAB0131W Java method {0} name contains underscore or numeric digits followed by a lower case letter.\
-Method names should not contain lower case letters after a numeric or underscore.
-MSG_WARN_BOOLEAN_PROPERTY_ACCESSORS=IWAB0132W Boolean property accessor {0} in bean {1} begins with "get". Boolean getter methods should begin wth "is".
-MSG_WARN_PACKAGE_NAME_HAS_UPPER_CASE=IWAB0133W The package name {0} of class {1} includes upper case letters. Package names should consist of lower case letters only.
-
-WARN_BEAN_NAME_STARTS_WITH_LOWER_CASE
-
-#
-# JavaToModelCommand
-#
-LABEL_OK=OK
-DESCRIPTION_OK=Select OK to continue
-
-LABEL_CANCEL=Cancel
-DESCRIPTION_CANCEL=Select Cancel to cancel
-
-#
-# CreateMonitorCommand
-#
-MSG_ERROR_UNABLE_TO_START_MONITOR=IWAB0001E Unable to monitor port {0} of {1}.
-MSG_INFO_MONITORING_NOT_SUPPORTED=IWAB0002I {0} does not support port monitoring.
-
-#
-# CopyWSDLCommand
-#
-COMMAND_LABEL_COPY_WSDL=Copying WSDL
-COMMAND_DESC_COPY_WSDL=Copying WSDL into the workspace for Web service deployment
-MSG_ERROR_COPY_WSDL=IWAB0028E Failed to copy WSDL {0} to {1}
-
-#
-# AssociateModuleWithEARCommand
-#
-MSG_ERROR_UNABLE_TO_ASSOCIATE=Unable to associate component {0} to ear component {1}.
-
-#
-# CreateModuleCommand
-#
-MSG_ERROR_CREATE_FLEX_PROJET=An error occured during creation of flexible project {0}.
-MSG_ERROR_CREATE_EJB_COMPONENT=An error occured during creation of EJB component {0}.
-MSG_ERROR_CREATE_APPCLIENT_COMPONENT=An error occured during creation of Application Client component {0}.
-MSG_ERROR_COMPONENT_CREATION=Unable to create project {0} and/or component {1}.
-
-
-#
-# CreateFacetedProjectCommand
-#
-MSG_ERROR_PROJECT_CREATION=Unable to create project {0}.
-
-
-#
-# PreServiceDevelopCommand
-#
-MSG_ERROR_PROJECT_DOES_NOT_EXIST=The project {0} does not exist.
-MSG_ERROR_PROJECT_IS_NOT_OPEN=The project {0} is not open.
-
-#
-# SPECIAL NOTE TO TRANSLATORS: Substitution {1} in MSG_ERROR_ADDING_FACETS_TO_PROJECT and
-# MSG_ERROR_FIXED_FACETS will be a delimited list of translated labels. The list is formed
-# through repeated use of MSG_FACETS.
-#
-MSG_ERROR_ADDING_FACETS_TO_PROJECT=Unable to add the follwing facets to project {0}: {1}.
-MSG_ERROR_FIXED_FACETS=Unable to set the following facets as fixed on project {0}: {1}.
-MSG_FACETS={0}, {1}
-
-MSG_ERROR_SETTING_RUNTIME=Unable to bind project {0} to the {1} runtime.
-
-#
-# Skeleton Merge Messages
-#
-MSG_ERROR_FILE_MERGE=Error in merging file {0}.
-MSG_ERROR_FILE_MERGE_LOAD=Error in loading file {0} for merge.
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/ConsumptionMessages.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/ConsumptionMessages.java
deleted file mode 100644
index d32724c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/ConsumptionMessages.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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
- * -------- -------- -----------------------------------------------------------
- * 20060217 126757 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060401 128827 kathy@ca.ibm.com - Kathy Chan
- * 20080402 224433 kathy@ca.ibm.com - Kathy Chan, Properties file change
- * 20080505 182167 makandre@ca.ibm.com - Andrew Mak, Warning not issued when non-instantiable class is bypassed in sampe JSPs
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class ConsumptionMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jst.ws.internal.consumption.Consumption";//$NON-NLS-1$
-
- private ConsumptionMessages() {
- // Do not instantiate
- }
-
- public static String MSG_ERROR_JTS_PROXY_HAS_NO_METHODS;
- public static String MSG_ERROR_JTS_PROXY_HAS_NO_DEFAULT;
- public static String MSG_ERROR_JTS_NO_PROXY_METHODS_PROCESSED;
- public static String MSG_WARN_JTS_UNSUPPORTED_TYPE;
- public static String MSG_WARN_JTS_UNSUPPORTED_INDEXED_PROPERTIES;
- public static String MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_ARRAYS;
- public static String MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_INPUTS;
- public static String MSG_ERROR_JTS_CYCLIC_BEAN;
- public static String MSG_WARN_JTS_PROXY_METHODS_OMITTED;
- public static String MSG_ERROR_SAMPLE_CREATION_CANCELED;
- public static String MSG_WARN_UNABLE_TO_FIND_PROXY;
- public static String MSG_ERROR_JTS_JSP_GEN;
- public static String MSG_WARN_JTS_NON_INSTANTIABLE_TYPE;
- public static String FILTER_MSG_ERROR_NULL_OBJECT;
- public static String FILTER_MSG_ERROR_NOT_FILE;
- public static String FILTER_MSG_ERROR_NOT_FOLDER;
- public static String JAVA_FILTER_NAME;
- public static String JAVA_FILTER_DESC;
- public static String JAVA_FILTER_MSG_ERROR_WRONG_EXTENSION;
- public static String WSDL_FILTER_NAME;
- public static String WSDL_FILTER_DESC;
- public static String WSDL_FILTER_MSG_ERROR_WRONG_EXTENSION;
- public static String ISD_FILTER_NAME;
- public static String ISD_FILTER_DESC;
- public static String ISD_FILTER_MSG_ERROR_WRONG_EXTENSION;
- public static String PROPERTIES_FILTER_NAME;
- public static String PROPERTIES_FILTER_DESC;
- public static String PROPERTIES_FILTER_MSG_ERROR_WRONG_EXTENSION;
- public static String FOLDER_FILTER_NAME;
- public static String FOLDER_FILTER_DESC;
- public static String PROGRESS_INFO_COPY_WEBSERVICE_UTILS;
- public static String PROGRESS_INFO_COPYING_FILE;
- public static String PROGRESS_INFO_START_WEB_PROJECT;
- public static String PROGRESS_INFO_PUBLISHING_SERVER;
- public static String PROGRESS_INFO_STARTING_SERVER;
- public static String PROGRESS_INFO_PUBLISH_WEB_PROJECT;
- public static String MSG_ERROR_PROJECT_NOT_FOUND;
- public static String MSG_ERROR_FILECOPY_WEBSERVICE_UTILS;
- public static String MSG_ERROR_INSTANCE_NOT_FOUND;
- public static String MSG_ERROR_SERVER;
- public static String MSG_ERROR_PUBLISH;
- public static String MSG_ERROR_ADD_MODULE;
- public static String MSG_ERROR_CREATE_SERVER;
- public static String MSG_ERROR_STUB_ONLY;
- public static String TASK_LABEL_CREATE_EJB_PROJECT;
- public static String TASK_DESC_CREATE_EJB_PROJECT;
- public static String MSG_ERROR_CANNOT_CREATE_EJB_PROJECT;
- public static String MSG_ERROR_CANNOT_CREATE_APP_CLIENT_PROJECT;
- public static String MSG_ERROR_CANNOT_CREATE_JAVA_PROJECT;
- public static String MSG_ERROR_CANNOT_CREATE_EAR_PROJECT;
- public static String TASK_LABEL_WEBSERVICE_DISABLE_VALIDATION;
- public static String TASK_DESC_WEBSERVICE_DISABLE_VALIDATION;
- public static String TASK_LABEL_WEBSERVICE_RESTORE_VALIDATION;
- public static String TASK_DESC_WEBSERVICE_RESTORE_VALIDATION;
- public static String TASK_LABEL_WEBSERVICE_DISABLE_BUILD;
- public static String TASK_DESC_WEBSERVICE_DISABLE_BUILD;
- public static String TASK_LABEL_WEBSERVICE_RESTORE_BUILD;
- public static String TASK_DESC_WEBSERVICE_RESTORE_BUILD;
- public static String MSG_ERROR_WEB_PROJECT_CREATE;
- public static String MSG_ERROR_SERVER_VIEW_OPEN;
- public static String MSG_WARN_JAVA_METHOD_START_WITH_UPPER_CASE;
- public static String MSG_WARN_METHOD_NAME_INVALID;
- public static String MSG_WARN_BOOLEAN_PROPERTY_ACCESSORS;
- public static String MSG_WARN_PACKAGE_NAME_HAS_UPPER_CASE;
- public static String WARN_BEAN_NAME_STARTS_WITH_LOWER_CASE;
- public static String LABEL_OK;
- public static String DESCRIPTION_OK;
- public static String LABEL_CANCEL;
- public static String DESCRIPTION_CANCEL;
- public static String MSG_ERROR_UNABLE_TO_START_MONITOR;
- public static String MSG_INFO_MONITORING_NOT_SUPPORTED;
- public static String COMMAND_LABEL_COPY_WSDL;
- public static String COMMAND_DESC_COPY_WSDL;
- public static String MSG_ERROR_COPY_WSDL;
- public static String MSG_ERROR_UNABLE_TO_ASSOCIATE;
- public static String MSG_ERROR_CREATE_FLEX_PROJET;
- public static String MSG_ERROR_CREATE_EJB_COMPONENT;
- public static String MSG_ERROR_CREATE_APPCLIENT_COMPONENT;
- public static String MSG_ERROR_COMPONENT_CREATION;
- public static String MSG_ERROR_PROJECT_CREATION;
- public static String MSG_ERROR_PROJECT_DOES_NOT_EXIST;
- public static String MSG_ERROR_PROJECT_IS_NOT_OPEN;
- public static String MSG_ERROR_ADDING_FACETS_TO_PROJECT;
- public static String MSG_ERROR_FIXED_FACETS;
- public static String MSG_FACETS;
- public static String MSG_ERROR_SETTING_RUNTIME;
- public static String MSG_ERROR_FILE_MERGE_LOAD;
- public static String MSG_ERROR_FILE_MERGE;
-
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, ConsumptionMessages.class);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/Generator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/Generator.java
deleted file mode 100644
index 8a2774b..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/Generator.java
+++ /dev/null
@@ -1,245 +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
- * -------- -------- -----------------------------------------------------------
- * 20060811 153482 mahutch@ca.ibm.com - Mark Hutchinson
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen;
-
-import java.util.Vector;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-
-
-/**
-* Objects of this class represent a generator.
-* */
-public class Generator implements VisitorAction
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- * The StringBuffer that holds the codegen
- * */
- protected StringBuffer fbuffer;
-
- /**
- * The Visitor that calls the visit method
- * */
- protected Visitor fVisitor;
-
- /**
- * Vector that holds state data for this generator
- * */
- protected Vector fResidentVector;
-
- /*
- * This int holds the current number
- */
- protected int fUniqueNumber =0;
-
-
- protected String fClientFolderPath;
-
- public static final String FACTORY = "Factory";
-
- public static final String TAB = " ";
- public static final String DOUBLE_TAB = " ";
- public static final String SPACE = " ";
-
- /**
- * Constructor.
- *
- */
- public Generator ()
- {
- fbuffer = new StringBuffer();
- fResidentVector = new Vector();
-
- }
-
- /**
- * Constructor.
- * @param StringBuffer Takes the buffer it will write code to
- */
- public Generator (StringBuffer buffer)
- {
- fbuffer = buffer;
- fResidentVector = new Vector();
- }
-
- public void initialize(String resident)
- {
- //nothing to be done but must be implemented
- }
-
- public String getClientFolderPath()
- {
- return fClientFolderPath;
- }
-
- public void setClientFolderPath(String fClientFolderPath_)
- {
- fClientFolderPath = fClientFolderPath_;
- }
-
- protected String serviceName = "";
- protected String portName = "";
- protected String packageName = "";
- protected String proxyBaseName = "";
-
- public void setInfo(String service, String port, String packageName, String proxyBase)
- {
- serviceName = service;
- portName = port;
- this.packageName = packageName;
- proxyBaseName = proxyBase;
- }
-
- private static final char UNDERSCORE = '_';
- public String getSessionBeanId()
- {
- String name = getClientFolderPath();
- int index = name.lastIndexOf("/");
- index++;
- StringBuffer newName = new StringBuffer(name.substring(index));
-
- //We need to make this a valid java identifier
- //To do this we will replace any character that is not valid with an underscore
- for (int i = 0; i < newName.length(); i++)
- {
- char c = newName.charAt(i);
- if (i == 0 && !Character.isJavaIdentifierStart(c) || !Character.isJavaIdentifierPart(c))
- {
- newName.setCharAt(i,UNDERSCORE);
- }
- }
- return newName + "id";
- }
-
- /*
- * The Number Factory is here for naming purposes. In
- * this way we insure no names we create in a piece of
- * code gen are the same. We keep track of the numbers
- * used and we hand back the next one. Like take a number
- * buddy
- * @param int number we are at as the state data has to be settable
- */
- public void setNumberFactory(int number)
- {
- fUniqueNumber = number;
- }
-
-
- /*
- * This is a unique number for state purposes
- * @return int
- */
- public int getNumberFactory()
- {
- return fUniqueNumber;
- }
- /*
- * This is a unique number for naming purposes
- * @return int
- */
- public int getUniqueNumber()
- {
- return fUniqueNumber++;
- }
-
-
- /**
- * returns the current StringBuffer
- * @return StringBuffer Takes the buffer it will write code too
- */
- public StringBuffer getStringBuffer ()
- {
- return fbuffer;
- }
-
-
- /**
- * returns the Visitor that called this generator
- * @return Visitor
- */
- public Visitor getVisitor ()
- {
- return fVisitor;
- }
-
-
-
-
- /**
- * vector used to hold state data
- * @parameter Visitor
- */
- public void putResidentVector (Object object)
- {
- fResidentVector.addElement(object);
- }
-
-
- /**
- * vector used to hold state data
- * @parameter Visitor
- */
- public void setResidentVector (Vector vector)
- {
- fResidentVector = vector;
- }
-
-
- /**
- * returns the resident vector
- * @return Visitor
- */
- public Vector getResidentVector ()
- {
- return fResidentVector;
- }
-
-
- /**
- * This function is used to initialize any state a generator may have
- *
- **/
-
- public void initialize()
- {
- //to be implemented in sublasses
- }
-
-
- /**
- * sets the visitor that calls the visit
- * @parameter Visitor
- */
-
- public void setVisitor(Visitor visitor)
- {
- fVisitor = visitor;
- }
-
-
- public IStatus visit (Object object)
- {
- //implemented by subclasses
- return Status.OK_STATUS;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/RelVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/RelVisitor.java
deleted file mode 100644
index eec9fdb..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/RelVisitor.java
+++ /dev/null
@@ -1,88 +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.consumption.codegen;
-
-import java.util.Enumeration;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-import org.eclipse.wst.ws.internal.datamodel.Rel;
-
-
-/**
-* Objects of this class represent a visitor.
-* This vistor will visit elements in a model given a
-* particular rel
-* */
-public class RelVisitor implements Visitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- private int fElementCounter;
- private int fTotalElements;
- private String frelName;
-
- /**
- * Constructor.
- *
- */
-
- public RelVisitor (String relName)
- {
- frelName = relName;
- }
-
- public int getTotalElementsToVisit()
- {
- return fTotalElements;
- }
-
- public boolean isLastElement()
- {
- if(getTotalElementsToVisit() - presentElement() == 0) return true;
- return false;
- }
-
- public int presentElement()
- {
- return fElementCounter;
- }
-
- public void initialize(VisitorAction va)
- {
- //implemented by subclasses
- }
- public IStatus run (Object sourceElement,VisitorAction vAction)
- {
- IStatus status = Status.OK_STATUS;
- initialize(vAction);
-
- vAction.setVisitor(this);
- Rel rel = ((BasicElement)sourceElement).getRel(frelName);
- //set some state data
- fTotalElements = rel.getNumberOfTargetElements();
- fElementCounter = 0;
-
- Enumeration e = rel.getTargetElements();
- while (e.hasMoreElements()){
- BasicElement targetElement = (BasicElement)e.nextElement();
- fElementCounter++;
- initialize(vAction);
- status = vAction.visit(targetElement);
- }
- return status;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/Visitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/Visitor.java
deleted file mode 100644
index a0a7040..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/Visitor.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen;
-
-import org.eclipse.core.runtime.IStatus;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public interface Visitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public IStatus run (Object object, VisitorAction vAction);
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/VisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/VisitorAction.java
deleted file mode 100644
index b94126b..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/VisitorAction.java
+++ /dev/null
@@ -1,31 +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.consumption.codegen;
-
-import org.eclipse.core.runtime.IStatus;
-
-
-/**
-* Objects of this class represent a VisitorAction.
-* The visitor walks the model and the VisitorAction
-* does the action
-* */
-public interface VisitorAction
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- public IStatus visit (Object object);
- public void setVisitor(Visitor visitor);
- public void initialize(String residentString);
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/AttributeVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/AttributeVisitor.java
deleted file mode 100644
index 8cfc623..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/AttributeVisitor.java
+++ /dev/null
@@ -1,77 +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.consumption.codegen.bean;
-
-import java.util.Vector;
-import org.eclipse.jst.ws.internal.consumption.codegen.RelVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeElement;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.InputFileAttributeGenerator;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class AttributeVisitor extends RelVisitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- private Vector fResidentVector1;
- private Vector fResidentVector2;
-
- /**
- * Constructor.
- *
- */
-
- public AttributeVisitor ()
- {
- super(TypeElement.REL_ATTRIBUTES);
- }
-
- public AttributeVisitor (String rel)
- {
- super(rel);
- }
-
- public void setResidentString(String resident)
- {
- }
-
- public void setResidentVector1(Vector resident)
- {
- fResidentVector1 = resident;
- }
-
- public void setResidentVector2(Vector resident)
- {
- fResidentVector2 = resident;
- }
-
-
- public void initialize(VisitorAction vAction)
- {
- //hack for 197726
-
- if(vAction instanceof InputFileAttributeGenerator){
- if(fResidentVector1 == null) fResidentVector1=new Vector();
- if(fResidentVector2 == null) fResidentVector2=new Vector();
- ((InputFileAttributeGenerator)vAction).setParentGetters(fResidentVector1,fResidentVector2);
- }
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/FieldVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/FieldVisitor.java
deleted file mode 100644
index 775be5f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/FieldVisitor.java
+++ /dev/null
@@ -1,71 +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.consumption.codegen.bean;
-
-import java.util.Vector;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeElement;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.InputFileAttributeGenerator;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class FieldVisitor extends AttributeVisitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- private Vector fResidentVector1;
- private Vector fResidentVector2;
-
- /**
- * Constructor.
- *
- */
-
- public FieldVisitor ()
- {
- super(TypeElement.REL_FIELDS);
- }
-
- public void setResidentString(String resident)
- {
- }
-
- public void setResidentVector1(Vector resident)
- {
- fResidentVector1 = resident;
- }
-
- public void setResidentVector2(Vector resident)
- {
- fResidentVector2 = resident;
- }
-
-
- public void initialize(VisitorAction vAction)
- {
- //hack for 197726
-
- if(vAction instanceof InputFileAttributeGenerator){
- if(fResidentVector1 == null) fResidentVector1=new Vector();
- if(fResidentVector2 == null) fResidentVector2=new Vector();
- ((InputFileAttributeGenerator)vAction).setParentGetters(fResidentVector1,fResidentVector2);
- }
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/MethodVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/MethodVisitor.java
deleted file mode 100644
index 3466462..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/MethodVisitor.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.bean;
-
-import org.eclipse.jst.ws.internal.consumption.codegen.RelVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanElement;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class MethodVisitor extends RelVisitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- * Constructor.
- *
- */
-
- public MethodVisitor ()
- {
- super(BeanElement.REL_METHODS);
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/ParameterVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/ParameterVisitor.java
deleted file mode 100644
index 0749312..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/ParameterVisitor.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.bean;
-
-import org.eclipse.jst.ws.internal.consumption.codegen.RelVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.MethodElement;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class ParameterVisitor extends RelVisitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- * Constructor.
- *
- */
-
- public ParameterVisitor ()
- {
- super(MethodElement.REL_PARAMETERS);
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/ReturnParameterVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/ReturnParameterVisitor.java
deleted file mode 100644
index 1f62070..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/ReturnParameterVisitor.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.bean;
-
-import org.eclipse.jst.ws.internal.consumption.codegen.RelVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.MethodElement;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class ReturnParameterVisitor extends RelVisitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- * Constructor.
- *
- */
-
- public ReturnParameterVisitor ()
- {
- super(MethodElement.REL_RETURN_PARAMETERS);
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/TypeVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/TypeVisitor.java
deleted file mode 100644
index d254615..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/TypeVisitor.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.bean;
-
-import org.eclipse.jst.ws.internal.consumption.codegen.RelVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeElement;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class TypeVisitor extends RelVisitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- * Constructor.
- *
- */
-
- public TypeVisitor ()
- {
- super(TypeElement.REL_TYPE);
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsBeanVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsBeanVisitorAction.java
deleted file mode 100644
index 6396e9f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsBeanVisitorAction.java
+++ /dev/null
@@ -1,91 +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.consumption.codegen.javamofvisitoractions;
-
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofMethodVisitor;
-
-
-
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a BeanElement using the
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk the methods in the JavaClass
-* */
-public class DetectNonJavaCharsBeanVisitorAction extends VisitorActionImpl
-{
- private static char UNDERSCORE = '_';
-
- public DetectNonJavaCharsBeanVisitorAction ( Vector messages, Vector beans)
- {
- super (messages, beans);
- }
-
- /**
- * The visit will create the bean
- * Walk the methods
- * @param JavaClass the class to be used to create the bean model
- **/
- public IStatus visit (Object javaclass)
- {
- JavaClass javaClass = (JavaClass)javaclass;
- String packageName = javaClass.getJavaPackage().getPackageName();
- String beanName = javaClass.getName();
-
- if (!isBeanVisited(javaClass)) {
- addVisitedBean(javaClass);
- // check the bean name
- checkBeanName(beanName);
- checkPackageName(packageName, beanName);
- DetectNonJavaCharsMethodVisitorAction methodVisitorAction = new DetectNonJavaCharsMethodVisitorAction(getMessages(), getBeansVisited());
- JavaMofMethodVisitor methodVisitor = new JavaMofMethodVisitor();
- methodVisitor.run(javaClass,methodVisitorAction);
- }
-
- return Status.OK_STATUS;
- }
-
- private void checkBeanName(String beanName)
- {
-
- // check if the bean starts with a lower case
- if ( Character.isLowerCase(beanName.charAt(0)))
- addMessage(ConsumptionMessages.WARN_BEAN_NAME_STARTS_WITH_LOWER_CASE, new String[]{beanName});
-
-
- //check if the name has an underscore, then next letter should be upper case
- int underScoreIndex = beanName.indexOf(UNDERSCORE);
- String tempName = beanName;
- while(underScoreIndex !=-1) {
- tempName = tempName.substring(underScoreIndex+1);
- if ( Character.isLowerCase(tempName.charAt(0))) {
- addMessage(ConsumptionMessages.MSG_WARN_METHOD_NAME_INVALID, new String[] { beanName });
- break;
- }
- else
- underScoreIndex = tempName.indexOf(UNDERSCORE);
- }
- }
-
- private void checkPackageName(String packageName, String beanName)
- {
- if (!packageName.equals(packageName.toLowerCase()))
- addMessage(ConsumptionMessages.MSG_WARN_PACKAGE_NAME_HAS_UPPER_CASE, new String[] { packageName, beanName });
- }
- }
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsMethodVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsMethodVisitorAction.java
deleted file mode 100644
index 6460bff..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsMethodVisitorAction.java
+++ /dev/null
@@ -1,116 +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.consumption.codegen.javamofvisitoractions;
-
-import java.util.Vector;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofParameterVisitor;
-
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a BeanElement using the
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk the methods in the JavaClass
-* */
-public class DetectNonJavaCharsMethodVisitorAction extends VisitorActionImpl
-{
- private static char UNDERSCORE = '_';
- private boolean serviceBean = false;
-
- public DetectNonJavaCharsMethodVisitorAction ( Vector messages, Vector beans)
- {
- super (messages, beans);
- if ( beans.size() == 1)
- serviceBean = true;
- }
-
- /**
- * Create a method element from the method
- * @param Method the class to be used to create the method
- **/
- public IStatus visit (Object imethod)
- {
-
- Method method = (Method)imethod;
- String className = method.getContainingJavaClass().getName();
- String name = method.getName();
-
- if ( serviceBean && !method.isConstructor() )
- checkUpperCase(name, className);
-
- // for service bean or any referenced bean property accessors
- if ( serviceBean || name.startsWith("get") || name.startsWith("set") || name.startsWith("is"))
- {
- checkUnderScore(name, className);
- checkNumericDigits(name, className);
- checkBooleanProperties(method, className);
-
- DetectNonJavaCharsParameterVisitorAction parameterVisitorAction = new DetectNonJavaCharsParameterVisitorAction(getMessages(), getBeansVisited());
- // rsk Passing in null for the environment. DetectNonJavaCharsParameterVisitorAction always returns an OK status.
- JavaMofParameterVisitor parameterVisitor = new JavaMofParameterVisitor(null);
- parameterVisitor.run(method, parameterVisitorAction);
- }
-
- return Status.OK_STATUS;
- }
-
- private void checkUpperCase(String name, String className)
- {
- // in a service bean check if any method starts with upper case letter
- if ( Character.isUpperCase(name.charAt(0)))
- addMessage(ConsumptionMessages.MSG_WARN_JAVA_METHOD_START_WITH_UPPER_CASE, new String[]{name, className});
-
- }
-
- private void checkUnderScore(String name, String className)
- {
- //check if the name has an underscore, then next letter should be upper case
- int underScoreIndex = name.indexOf(UNDERSCORE);
- String tempName = name;
- while(underScoreIndex !=-1) {
- tempName = tempName.substring(underScoreIndex+1);
- if ( Character.isLowerCase(tempName.charAt(0))) {
- addMessage(ConsumptionMessages.MSG_WARN_METHOD_NAME_INVALID, new String[]{name, className});
- break;
- }
- else
- underScoreIndex = tempName.indexOf(UNDERSCORE);
- }
- }
-
- private void checkNumericDigits(String name, String className)
- {
- //check if the name has a numeric, then next letter should be upper case
- for ( int i = 0; i < name.length(); i++)
- {
- if ( Character.isDigit(name.charAt(i)))
- {
- if (Character.isLowerCase(name.charAt(i+1))) {
- addMessage(ConsumptionMessages.MSG_WARN_METHOD_NAME_INVALID, new String[]{name, className});
- break;
- }
- }
- }
- }
- private void checkBooleanProperties(Method method, String className)
- {
- if (!serviceBean && method.getName().startsWith("get") &&
- (method.getReturnType().getName().equals("boolean") ||
- method.getReturnType().getName().equals("java.lang.Boolean")))
- addMessage(ConsumptionMessages.MSG_WARN_BOOLEAN_PROPERTY_ACCESSORS, new String[]{method.getName(), className});
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsParameterVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsParameterVisitorAction.java
deleted file mode 100644
index 1ae28a1..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsParameterVisitorAction.java
+++ /dev/null
@@ -1,86 +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.consumption.codegen.javamofvisitoractions;
-
-import java.util.Vector;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.ArrayType;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofBeanVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-
-
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a BeanElement using the
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk the methods in the JavaClass
-* */
-public class DetectNonJavaCharsParameterVisitorAction extends VisitorActionImpl
-{
-
- public DetectNonJavaCharsParameterVisitorAction ( Vector messages, Vector beans)
- {
- super (messages, beans);
- }
-
- /**
- * Create a method element from the method
- * @param Method the class to be used to create the method
- **/
- public IStatus visit (Object ijavaParameter)
- {
-
- JavaParameter javaParameter = (JavaParameter) ijavaParameter;
- JavaClass javaClass = null;
- if ( javaParameter.getJavaType() instanceof JavaClass)
- {
- javaClass = (JavaClass) javaParameter.getJavaType();
- if (javaClass.isArray())
- {
- JavaHelpers componentType = ((ArrayType)javaClass).getComponentTypeAsHelper();
- if (componentType instanceof JavaClass)
- {
- javaClass = (JavaClass)componentType;
- }
- else
- {
- javaClass = null; //The array contains primitive types, there is no need for further checking.
- }
- }
- }
- if (toBeVisited(javaClass)) {
- DetectNonJavaCharsBeanVisitorAction beanVisitorAction = new DetectNonJavaCharsBeanVisitorAction(getMessages(), getBeansVisited());
- JavaMofBeanVisitor beanVisitor = new JavaMofBeanVisitor();
- beanVisitor.run(javaClass,beanVisitorAction);
- }
-
- return Status.OK_STATUS;
- }
-
-
- private boolean toBeVisited (JavaClass javaClass)
- {
- //check for recognized types
- if( javaClass == null ||
- javaClass.isPrimitive() ||
- javaClass.getJavaName().startsWith("javax") ||
- TypeFactory.recognizedBean(javaClass.getJavaName()))
- return false;
- else
- return true;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofAttributeVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofAttributeVisitorAction.java
deleted file mode 100644
index 1f3ca29..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofAttributeVisitorAction.java
+++ /dev/null
@@ -1,129 +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.consumption.codegen.javamofvisitoractions;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofTypeVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.AttributeElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanModelElementsFactory;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.common.SamplePropertyDescriptor;
-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.environment.StatusException;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a AttributeElement using the
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk a complex type
-* */
-public class JavaMofAttributeVisitorAction extends JavaMofBeanVisitorAction
-{
-
- /*
- *Constructor
- **/
- public JavaMofAttributeVisitorAction(Element parentElement, String project, IEnvironment env)
- {
- super(parentElement,project, env);
- }
-
- public IStatus visit (Object propertyDecorator)
- {
- IStatus status = Status.OK_STATUS;
-
- //PropertyDecorator pd = (PropertyDecorator)propertyDecorator;
- SamplePropertyDescriptor pd = (SamplePropertyDescriptor)propertyDecorator;
-
-
- try{
- //if the type of this attribute is unsupported dont make an Attribute
- if(!(getReturnParam() && TypeFactory.isRecognizedReturnType((JavaHelpers)pd.getPropertyType()))
- && (TypeFactory.isUnSupportedType((JavaHelpers)pd.getPropertyType()))){
- status = StatusUtils.warningStatus( ConsumptionMessages.MSG_WARN_JTS_UNSUPPORTED_TYPE + ((JavaHelpers)pd.getPropertyType()).getJavaName() );
- //getStatusMonitor().reportStatus( new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
- //ConsumptionMessages.MSG_WARN_JTS_UNSUPPORTED_TYPE + ((JavaHelpers)pd.getPropertyType()).getJavaName(),null));
- return status;
- }
-
- Method setMethod = pd.getWriteMethod();
- Method getMethod = pd.getReadMethod();
- if(setMethod != null){
- if(setMethod.isStatic()){
- setMethod=null;
- }
- }
- if(getMethod != null){
- if(getMethod.isStatic()){
- getMethod=null;
- }
- }
- if(pd.isfStatic()){
- return status;
- }
-
- AttributeElement attributeElement = (AttributeElement)BeanModelElementsFactory.getBeanModelElement(propertyDecorator,fParentElement);
-
- if(attributeElement != null){
-
- //lets check and see if the getter takes input params
- //if so throw an error
- //now the inputs
- if(getMethod != null){
- JavaParameter javaParameter[] = getMethod.listParametersWithoutReturn();
- if(javaParameter.length > 0){
- if(getReturnParam()) return status;
- status = StatusUtils.warningStatus( ConsumptionMessages.MSG_WARN_JTS_UNSUPPORTED_INDEXED_PROPERTIES + getMethod.getName() );
- //getStatusMonitor().reportStatus (new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
- // ConsumptionMessages.MSG_WARN_JTS_UNSUPPORTED_INDEXED_PROPERTIES + getMethod.getName(),null));
- return status;
- }
- }
- if(setMethod != null) attributeElement.setSetterMethod(setMethod.getMethodElementSignature());
- if(getMethod != null) attributeElement.setGetterMethod(getMethod.getMethodElementSignature());
-
- JavaMofTypeVisitorAction typeVisitorAction = new JavaMofTypeVisitorAction(attributeElement,clientProject, env_);
- typeVisitorAction.setStatusMonitor(getStatusMonitor());
- typeVisitorAction.setBeansCreated(getBeansCreated());
- typeVisitorAction.setReturnParam(getReturnParam());
- JavaMofTypeVisitor typeVisitor = new JavaMofTypeVisitor(env_);
- typeVisitor.setClientProject(getProject());
- status = typeVisitor.run(pd,typeVisitorAction);
-
- }
-
- return status;
- }catch(Exception e)
- {
- env_.getLog().log(ILog.WARNING, 5054, this, "visit", e);
- status = StatusUtils.warningStatus( ConsumptionMessages.MSG_ERROR_JTS_JSP_GEN, e);
- try {
- env_.getStatusHandler().report(status);
- } catch (StatusException e1) {
- status = StatusUtils.errorStatus(ConsumptionMessages.MSG_ERROR_JTS_JSP_GEN);
- }
- return status;
- }
- //env.Log.write(this,"visit",ILog.OK,e);}
-
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofBeanVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofBeanVisitorAction.java
deleted file mode 100644
index 7fec64d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofBeanVisitorAction.java
+++ /dev/null
@@ -1,423 +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
- * -------- -------- -----------------------------------------------------------
- * 20070313 176580 makandre@ca.ibm.com - Andrew Mak, Generate a Client WS Proxy accepting URL
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitoractions;
-
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.command.NullStatusMonitor;
-import org.eclipse.jst.ws.internal.command.StatusMonitor;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofAttributeVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofFieldVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofMethodVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanModelElementsFactory;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.selection.BooleanSelection;
-import org.eclipse.wst.common.environment.Choice;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a BeanElement using the
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk the methods in the JavaClass
-* */
-public class JavaMofBeanVisitorAction implements VisitorAction
-{
-
- protected IEnvironment env_;
- protected Visitor fVisitor;
-
- /*
- * The project that defines the context
- **/
- protected String clientProject;
-
- /*
- * The Status monitor
- **/
- protected StatusMonitor monitor_;
-
- /*
- * The model that will be created
- **/
- protected Model fModel;
-
- /*
- * This is the parent element used when creating a
- * new element
- */
- protected Element fParentElement;
-
- /*
- * Methods processed from proxy
- */
- protected Vector fBeansCreated;
-
- private BooleanSelection[] fMethodsSelected;
-
- /*
- * this boolean tells wether the bean is a return parameter or an input parameter
- * usually this should be set around the parametervisitoraction, and passed on from there
- */
- protected boolean fReturnParam=false;
-
- public JavaMofBeanVisitorAction(String clientProject,BooleanSelection[] methods, IEnvironment env)
- {
- this.clientProject = clientProject;
- fMethodsSelected = methods;
- env_ = env;
- }
-
-
-
- /*
- *Constructor
- * @param Model model is the Model that this bean will be placed in
- * @param IProject used in nature
- **/
- public JavaMofBeanVisitorAction(Model model, String clientProject, IEnvironment env)
- {
- this.clientProject = clientProject;
- fModel = model;
- env_ = env;
- }
-
- /*
- *Constructor
- * @param Element the parent element that this element will be added too
- * @param IProject used in nature
- **/
- public JavaMofBeanVisitorAction(Element parentElement, String clientProject, IEnvironment env )
- {
- fParentElement = parentElement;
- this.clientProject = clientProject;
- env_ = env;
- }
-
- /**
- * The visit will create the bean
- * Walk the methods
- * @param JavaClass the class to be used to create the bean model
- **/
- public IStatus visit (Object javaclass)
- {
- Choice OKChoice = new Choice('O', ConsumptionMessages.LABEL_OK, ConsumptionMessages.DESCRIPTION_OK);
- Choice CancelChoice = new Choice('C', ConsumptionMessages.LABEL_CANCEL, ConsumptionMessages.DESCRIPTION_CANCEL);
- IStatus status = Status.OK_STATUS;
- JavaClass javaClass = (JavaClass)javaclass;
-
-
- BeanElement beanElement = (BeanElement)BeanModelElementsFactory.getBeanModelElement(javaClass,fParentElement,fModel);
- if(beanElement.isOwnerParameter()) {
- resetBeansCreated();
- }
- fModel = beanElement.getModel();
-
- //this for the subsequent beans that represent types
- //first do the attributes
- //if we are not on the root
- if (!(beanElement == fModel.getRootElement())){
- Enumeration e = getBeansCreated().elements();
- while(e.hasMoreElements()){
- String name = (String)e.nextElement();
- if(name.equals(javaClass.getName())){
- status = StatusUtils.warningStatus( ConsumptionMessages.MSG_ERROR_JTS_CYCLIC_BEAN );
- //getStatusMonitor().reportStatus(new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
- //WebServiceConsumptionPlugin.getMessage( "%MSG_ERROR_JTS_CYCLIC_BEAN" ),null));
- return status;
- }
- }
-
- JavaMofAttributeVisitorAction attributeVisitorAction = new JavaMofAttributeVisitorAction(beanElement,clientProject, env_);
- //attributeVisitorAction.setStatusMonitor(getStatusMonitor());
- Vector childVector = ((Vector)getBeansCreated().clone());
- childVector.addElement(javaClass.getName());
- attributeVisitorAction.setBeansCreated(childVector);
- attributeVisitorAction.setReturnParam(getReturnParam());
- JavaMofAttributeVisitor attributeVisitor = new JavaMofAttributeVisitor();
- attributeVisitor.setReturnParameter(getReturnParam());
- attributeVisitor.setProject(getProject());
- attributeVisitor.setEnvironment(env_);
- status = attributeVisitor.run(javaClass,attributeVisitorAction);
- //
- int severity = status.getSeverity();
- if (severity==Status.ERROR)
- return status;
-
- if (severity==Status.WARNING)
- {
- Choice result = env_.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
- if (result.getLabel().equals(CancelChoice.getLabel()))
- {
- //return an error status since the user canceled
- return StatusUtils.errorStatus(ConsumptionMessages.MSG_ERROR_SAMPLE_CREATION_CANCELED );
- }
-
- }
- //
-
- JavaMofFieldVisitorAction fieldVisitorAction = new JavaMofFieldVisitorAction(beanElement,clientProject, env_);
- //fieldVisitorAction.setStatusMonitor(getStatusMonitor());
- Vector childVector2 = ((Vector)getBeansCreated().clone());
- childVector2.addElement(javaClass.getName());
- fieldVisitorAction.setBeansCreated(childVector2);
- fieldVisitorAction.setReturnParam(getReturnParam());
- JavaMofFieldVisitor fieldVisitor = new JavaMofFieldVisitor();
- fieldVisitor.setProject(getProject());
- status = fieldVisitor.run(javaClass,fieldVisitorAction);
- //
- severity = status.getSeverity();
- if (severity==Status.ERROR)
- return status;
-
- if (severity==Status.WARNING)
- {
- Choice result = env_.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
- if (result.getLabel().equals(CancelChoice.getLabel()))
- {
- //return an error status since the user canceled
- return StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_SAMPLE_CREATION_CANCELED );
- }
-
- }
- //
-
- }
-
- //this is to insure we are on the proxy
- //now do the methods
- if (beanElement == fModel.getRootElement()){
- //first lets make sure the proxy is in good form
- //-it has a default constructor
- //-it has at least one method
- //otherwise return the problem in the form of a status
-
- if (!proxyCheck(javaClass, status)) return status;
- JavaMofMethodVisitorAction methodVisitorAction = new JavaMofMethodVisitorAction(beanElement,clientProject, env_);
-
- //methodVisitorAction.setStatusMonitor(getStatusMonitor());
- JavaMofMethodVisitor methodVisitor = new JavaMofMethodVisitor();
- methodVisitor.setMethodSelection(fMethodsSelected);
- status = methodVisitor.run(javaClass,methodVisitorAction);
-
- //
- int severity = status.getSeverity();
- if (severity==Status.ERROR)
- return status;
-
- if (severity==Status.WARNING)
- {
- Choice result = env_.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
- if (result.getLabel().equals(CancelChoice.getLabel()))
- {
- //return an error status since the user canceled
- return StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_SAMPLE_CREATION_CANCELED );
- }
-
- }
- //
- //This is where we check for several things:
- //-if no methods were processed because of unsupported types then we send back that result
- //-if there were any methods omitted we should warn them
-
- //first no methods
- if (!methodVisitorAction.wereMethodsProcessed()){
- //this has to be done to insure the dialog is an error
- status = StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_JTS_NO_PROXY_METHODS_PROCESSED );
- return status;
- //getStatusMonitor().reportStatus( new Status(IStatus.ERROR,WebServiceConsumptionPlugin.ID,0,
- // WebServiceConsumptionPlugin.getMessage( "%MSG_ERROR_JTS_NO_PROXY_METHODS_PROCESSED" ),null));
- }
- //now methods omitted
- else if(methodVisitorAction.wereMethodsOmitted()){
- //The dialog is already a warning so we just need to set the overall message
- status = StatusUtils.warningStatus( ConsumptionMessages.MSG_WARN_JTS_PROXY_METHODS_OMITTED );
- return status;
- //getStatusMonitor().reportStatus( new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
- // ConsumptionMessages.MSG_WARN_JTS_PROXY_METHODS_OMITTED,null));
- }
- }
- return status;
- }
-
- public void initialize(String resident)
- {
- //nothing to be done but must be implemented
- }
-
-
- /*
- * Return the model that was created
- * @return Model the bean model that was created
- */
- public Model getModel()
- {
- return fModel;
- }
-
- /*
- * The proxy check insures there is a default constructor and
- * at Least one method
- * @param JavaClass javaClass is used to traverse the methods on the proxy
- */
- public boolean proxyCheck(JavaClass javaClass, IStatus status)
- {
- // first check for a method
- Iterator m=javaClass.getPublicMethods().iterator();
- if (!m.hasNext()){
- status = StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_JTS_PROXY_HAS_NO_METHODS );
- //getStatusMonitor().reportStatus( new Status(IStatus.ERROR,WebServiceConsumptionPlugin.ID,0,
- // ConsumptionMessages.MSG_ERROR_JTS_PROXY_HAS_NO_METHODS,null));
- return false;
- }
- //now check for a default constructor
- while (m.hasNext()) {
- Method method=(Method)m.next();
- if (javaClass.getName().equals(method.getName())){
- //now the inputs
- JavaParameter javaParameter[] = method.listParametersWithoutReturn();
- if (javaParameter.length == 0)
- return true;
- }
- }
- return false;
-
- }
-
- /**
- * Sets the status monitor that this action will use to report status that occres while executing the Action.
- */
- public void setStatusMonitor ( StatusMonitor monitor )
- {
- monitor_ = monitor;
- }
-
- /**
- * Returns the status monitor that this task is using to report status.
- */
- public StatusMonitor getStatusMonitor ()
- {
- if (monitor_ == null)
- {
- monitor_ = new NullStatusMonitor();
- }
- return monitor_;
- }
-
-
- /**
- * check if the action has finished sucsessfully
- */
- /*
- public boolean isSuccessful ()
- {
- return getStatusMonitor().canContinue();
- }
- */
- public void resetBeansCreated()
- {
- fBeansCreated = new Vector();
- }
-
- public void setEnvironment(IEnvironment env)
- {
- env_ = env;
- }
-
- /*
- * The command that called this will get the results of the operation in the form
- * of a status.
- */
- public Vector getBeansCreated ()
- {
- if(fBeansCreated == null) fBeansCreated = new Vector();
- return fBeansCreated;
- }
-
- /*
- * The command that called this will get the results of the operation in the form
- * of a status.
- */
- public void setBeansCreated (Vector beansCreated)
- {
- fBeansCreated = beansCreated;
- }
-
- /*
- * This boolean tells wether we are dealing with a return param
- */
- public boolean getReturnParam ()
- {
- return fReturnParam;
- }
-
- /*
- * This boolean tells wether we are dealing with a return param
- */
- public void setReturnParam (boolean returnparam)
- {
- fReturnParam = returnparam;
- }
-
- /*
- * This boolean tells wether we are dealing with a return param
- */
- public String getProject ()
- {
- return clientProject;
- }
-
- /*
- * This boolean tells wether we are dealing with a return param
- */
- public void setProject (String clientProject)
- {
- this.clientProject = clientProject;
- }
-
-
- /**
- * sets the visitor that calls the visit
- * @parameter Visitor
- */
-
- public void setVisitor(Visitor visitor)
- {
- fVisitor = visitor;
- }
-
- /*
- * Sets the parent element the child then knows where to
- * add itself to the model
- * @param Element parent element
- */
- public void setParentElement(Element element)
- {
- fParentElement = element;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofFieldVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofFieldVisitorAction.java
deleted file mode 100644
index 964257a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofFieldVisitorAction.java
+++ /dev/null
@@ -1,98 +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.consumption.codegen.javamofvisitoractions;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofTypeVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanModelElementsFactory;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.FieldElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-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.environment.StatusException;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a AttributeElement using the
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk a complex type
-* */
-public class JavaMofFieldVisitorAction extends JavaMofBeanVisitorAction
-{
-
- /*
- *Constructor
- **/
- public JavaMofFieldVisitorAction(Element parentElement, String project, IEnvironment env)
- {
- super(parentElement,project, env);
- }
-
-
- public IStatus visit (Object field_)
- {
- IStatus status = Status.OK_STATUS;
- Field field = (Field)field_;
-
- try{
- //if the type of this attribute is unsupported dont make an Attribute
- if(!(getReturnParam() && TypeFactory.isRecognizedReturnType((JavaHelpers)field.getJavaClass()))
- && (TypeFactory.isUnSupportedType((JavaHelpers)field.getJavaClass()))){
- status = StatusUtils.warningStatus( ConsumptionMessages.MSG_WARN_JTS_UNSUPPORTED_TYPE + ((JavaHelpers)field.getJavaClass()).getJavaName() );
- //getStatusMonitor().reportStatus( new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
- //ConsumptionMessages.MSG_WARN_JTS_UNSUPPORTED_TYPE + ((JavaHelpers)field.getJavaClass()).getJavaName(),null));
- return status;
- }
-
-
- FieldElement fieldElement = (FieldElement)BeanModelElementsFactory.getBeanModelElement(field,fParentElement);
-
- if(fieldElement != null){
- //lets check and see if the getter takes input params
- //if so throw an error
- //now the inputs
-
- JavaMofTypeVisitorAction typeVisitorAction = new JavaMofTypeVisitorAction(fieldElement,clientProject, env_);
- typeVisitorAction.setStatusMonitor(getStatusMonitor());
- typeVisitorAction.setBeansCreated(getBeansCreated());
- typeVisitorAction.setReturnParam(getReturnParam());
- JavaMofTypeVisitor typeVisitor = new JavaMofTypeVisitor(env_);
- typeVisitor.setClientProject(getProject());
- status = typeVisitor.run(field,typeVisitorAction);
-
- }
- return status;
-
- }catch(Exception e)
- {
- env_.getLog().log(ILog.WARNING, 5055, this, "visit", e);
- status = StatusUtils.warningStatus( ConsumptionMessages.MSG_ERROR_JTS_JSP_GEN, e);
- try {
- env_.getStatusHandler().report(status);
- }
- catch (StatusException e1)
- {
- status = StatusUtils.errorStatus(ConsumptionMessages.MSG_ERROR_JTS_JSP_GEN, e1 );
- }
- return status;
- }
-
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofMethodVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofMethodVisitorAction.java
deleted file mode 100644
index 1151664..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofMethodVisitorAction.java
+++ /dev/null
@@ -1,219 +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.consumption.codegen.javamofvisitoractions;
-
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofParameterVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanModelElementsFactory;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.MethodElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a BeanElement using the
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk the methods in the JavaClass
-* */
-public class JavaMofMethodVisitorAction extends JavaMofBeanVisitorAction
-{
-
- public String fUnsupportedParameterName;
-
- /*
- * Methods omitted from the proxy
- */
- protected Vector fMethodsOmitted;
-
- /*
- * Methods processed from proxy
- */
- protected Vector fMethodsProcessed;
-
-
- /*
- *Constructor
- **/
- public JavaMofMethodVisitorAction(Element parentElement,String project, IEnvironment env)
- {
- super(parentElement,project, env);
- fMethodsOmitted = new Vector();
- fMethodsProcessed = new Vector();
-
- }
-
- /**
- * Create a method element from the method
- * @param Method the class to be used to create the method
- **/
- public IStatus visit (Object imethod)
- {
- IStatus status = Status.OK_STATUS;
- Method method = (Method)imethod;
-
- if (methodCheck(method)){
- //this is to check immediate input and return parameters
- //if there is an unsupported type in these we can react immediately
- //we add it to the omitted methods an go to the next one
- if(!parameterCheck(method)){
- status = StatusUtils.warningStatus(ConsumptionMessages.MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_ARRAYS + fUnsupportedParameterName );
- //getStatusMonitor().reportStatus (new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
- // ConsumptionMessages.MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_ARRAYS + fUnsupportedParameterName,null));
- fMethodsOmitted.addElement(method.getMethodElementSignature());
- return status;
- }
- if(!nullConstructor(method)){
- status = StatusUtils.warningStatus( ConsumptionMessages.MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_INPUTS + fUnsupportedParameterName );
- //getStatusMonitor().reportStatus (new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
- // ConsumptionMessages.MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_INPUTS + fUnsupportedParameterName,null));
- fMethodsOmitted.addElement(method.getMethodElementSignature());
- return status;
-
- }
-
- //carry on all parameters supported
- MethodElement methodElement = (MethodElement)BeanModelElementsFactory.getBeanModelElement(method,fParentElement);
- JavaMofParameterVisitorAction parameterVisitorAction = new JavaMofParameterVisitorAction(methodElement,clientProject,env_);
- parameterVisitorAction.setStatusMonitor(getStatusMonitor());
- JavaMofParameterVisitor parameterVisitor = new JavaMofParameterVisitor(env_);
- status = parameterVisitor.run(method,parameterVisitorAction);
- //something may have gone wrong with an internal type
- if (status.getSeverity()!=Status.OK){
- //This method has to be omitted
- fMethodsOmitted.addElement(method.getMethodElementSignature());
- methodElement.setMethodOmmission(true);
- }
- else {
- fMethodsProcessed.addElement(method.getMethodElementSignature());
- }
- }
-
- return status;
- }
-
- /*
- * Tells wether any methods were processed
- * @return boolean true if any methods were processed
- */
- public boolean wereMethodsProcessed()
- {
- if(fMethodsProcessed.isEmpty()) return false;
- return true;
- }
-
- /*
- * Tells wether there were methods omitted because of unsupported types
- * @return boolean true if methods were omitted
- */
- public boolean wereMethodsOmitted()
- {
- if(fMethodsOmitted.isEmpty()) return false;
- return true;
- }
-
- /**
- * There may be methods that we dont support
- * and dont want in the model
- * @param boolean true if all parameters are fine
- **/
- public boolean methodCheck(Method method)
- {
- boolean ok = true;
- // if we have a constructor we return false
- if (method.isConstructor()) return false;
-
-
- return ok;
- }
-
- /**
- * There may be parameters of this method that have types
- * not yet supported return false if we find any
- * @param boolean true if all parameters are fine
- **/
- public boolean parameterCheck(Method method)
- {
-
- boolean ok = true;
-
- //now the inputs
- JavaParameter javaParameter[] = method.listParametersWithoutReturn();
- for (int i = 0;i<javaParameter.length;i++) {
- JavaParameter param=javaParameter[i];
- JavaHelpers javaHelper1 = param.getJavaType();
- if(TypeFactory.isUnSupportedType(javaHelper1)) {
- fUnsupportedParameterName = param.getName();
- return false;
- }
- }
- return ok;
- }
-
-
- /**
- * There may be parameters of this method that have types
- * not yet supported return false if we find any
- * @param boolean true if all parameters are fine
- **/
- public boolean nullConstructor(Method method)
- {
-
- boolean ok = true;
- //now the inputs
- JavaParameter javaParameter[] = method.listParametersWithoutReturn();
- for (int i = 0;i<javaParameter.length;i++) {
- JavaParameter param=javaParameter[i];
- JavaHelpers javaHelper1 = param.getJavaType();
- if(javaHelper1 instanceof JavaClass){
- JavaClass javaClass = (JavaClass)javaHelper1;
- if(TypeFactory.recognizedBean(javaClass.getJavaName()))return true;
- Iterator m=javaClass.getMethods().iterator();
- while (m.hasNext()) {
- Method method2=(Method)m.next();
- if (javaClass.getName().equals(method2.getName())){
- //now the inputs
- JavaParameter javaParam[] = method2.listParametersWithoutReturn();
- if (javaParam.length > 0){
- //then we have no default constructor
- fUnsupportedParameterName = param.getName();
- ok = false;
- }
- else return true;
- }
- }
- }
- }
- return ok;
- }
-
-
-
-
-
-
-
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofParameterVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofParameterVisitorAction.java
deleted file mode 100644
index 42f541e..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofParameterVisitorAction.java
+++ /dev/null
@@ -1,80 +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.consumption.codegen.javamofvisitoractions;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofTypeVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanModelElementsFactory;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.ParameterElement;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Choice;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a parameterElement using the
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk to its type
-* */
-public class JavaMofParameterVisitorAction extends JavaMofBeanVisitorAction
-{
-
-
- /*
- *Constructor
- **/
- public JavaMofParameterVisitorAction(Element parentElement,String project, IEnvironment env)
- {
- super(parentElement,project, env);
- }
-
- /**
- * Create a parameter element from the method
- * @param JavaParameter the mof element to be used to create the Parameter
- **/
- public IStatus visit (Object ijavaParameter)
- {
- IStatus status = Status.OK_STATUS;
- Choice OKChoice = new Choice('O',ConsumptionMessages.LABEL_OK, ConsumptionMessages.DESCRIPTION_OK);
- Choice CancelChoice = new Choice('C', ConsumptionMessages.LABEL_CANCEL, ConsumptionMessages.DESCRIPTION_CANCEL);
-
- ParameterElement parameterElement = (ParameterElement)BeanModelElementsFactory.getBeanModelElement(ijavaParameter,fParentElement);
- JavaMofTypeVisitorAction typeVisitorAction = new JavaMofTypeVisitorAction(parameterElement,clientProject, env_);
- //typeVisitorAction.setStatusMonitor(getStatusMonitor());
- typeVisitorAction.setReturnParam(parameterElement.isReturn());
- JavaMofTypeVisitor typeVisitor = new JavaMofTypeVisitor(env_);
- typeVisitor.setClientProject(getProject());
- status = typeVisitor.run(ijavaParameter,typeVisitorAction);
- //
- int severity = status.getSeverity();
- if (severity==Status.ERROR)
- return status;
-
- if (severity==Status.WARNING)
- {
- Choice result = env_.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
- if (result.getLabel().equals(CancelChoice.getLabel()))
- {
- //return an error status since the user canceled
- return StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_SAMPLE_CREATION_CANCELED );
- }
-
- }
- //
- return status;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofTypeVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofTypeVisitorAction.java
deleted file mode 100644
index 6544a0c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofTypeVisitorAction.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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
- * -------- -------- -----------------------------------------------------------
- * 20070410 180952 makandre@ca.ibm.com - Andrew Mak, Sample JSP generator chokes on interfaces and abstract classes
- * 20080505 182167 makandre@ca.ibm.com - Andrew Mak, Warning not issued when non-instantiable class is bypassed in sampe JSPs
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitoractions;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaVisibilityKind;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofBeanVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanModelElementsFactory;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Choice;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a TypeElement using the
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk a complex type
-* */
-public class JavaMofTypeVisitorAction extends JavaMofBeanVisitorAction
-{
-
- /*
- *Constructor
- **/
- public JavaMofTypeVisitorAction(Element parentElement,String project, IEnvironment env)
- {
- super(parentElement,project, env);
- }
-
- /**
- * Create a type element from the JavaHelper
- * @param JavaHelper the mof element to be used to create the Type
- **/
- public IStatus visit (Object typeNavigator)
- {
- IStatus status = Status.OK_STATUS;
- Choice OKChoice = new Choice('O', ConsumptionMessages.LABEL_OK, ConsumptionMessages.DESCRIPTION_OK);
- Choice CancelChoice = new Choice('C', ConsumptionMessages.LABEL_CANCEL, ConsumptionMessages.DESCRIPTION_CANCEL);
-
- //if bean
- JavaClass javaClass = null;
- if(typeNavigator instanceof JavaClass){
- javaClass = (JavaClass)typeNavigator;
- }
-
-
- /* If we are dealing with a return parameter then we need to treat this differently then if it is an input
- * parameter.
- * We need to first see if it is a special case for return types if not we treat it the same as everything
- * else.
- */
- if(getReturnParam() && TypeFactory.isRecognizedReturnType((JavaHelpers)typeNavigator))
- {
- BeanModelElementsFactory.getBeanModelElement(typeNavigator,fParentElement);
- }
- else{
- if(TypeFactory.isUnSupportedType((JavaHelpers)typeNavigator)){
- status = StatusUtils.warningStatus( ConsumptionMessages.MSG_WARN_JTS_UNSUPPORTED_TYPE + ((JavaHelpers)typeNavigator).getJavaName() );
- //getStatusMonitor().reportStatus( new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
- //ConsumptionMessages.MSG_WARN_JTS_UNSUPPORTED_TYPE + ((JavaHelpers)typeNavigator).getJavaName(),null));
- return status;
- }
-
- //if javaclass is null then we have a simple type
- if((javaClass == null) || TypeFactory.recognizedBean(javaClass.getJavaName()))
- {
- BeanModelElementsFactory.getBeanModelElement(typeNavigator,fParentElement);
- }
- else if (javaClass != null && !getReturnParam() &&
- // the following cases cannot be instantiated for input
- (javaClass.isInterface() || javaClass.isAbstract() || !hasDefaultConstructor(javaClass))) {
-
- Element element = BeanModelElementsFactory.getBeanModelElement(typeNavigator,fParentElement);
- element.setPropertyAsObject(TypeElement.NON_INSTANTIABLE, Boolean.TRUE);
- status = StatusUtils.warningStatus(
- ConsumptionMessages.bind(ConsumptionMessages.MSG_WARN_JTS_NON_INSTANTIABLE_TYPE, element.getName()));
- }
- else{
- JavaMofBeanVisitorAction beanVisitorAction = new JavaMofBeanVisitorAction(fParentElement,clientProject, env_);
- beanVisitorAction.setStatusMonitor(getStatusMonitor());
- beanVisitorAction.setBeansCreated(getBeansCreated());
- beanVisitorAction.setReturnParam(getReturnParam());
- JavaMofBeanVisitor beanVisitor = new JavaMofBeanVisitor();
- status = beanVisitor.run(javaClass,beanVisitorAction);
- }
- }
-
- //
- int severity = status.getSeverity();
- if (severity==Status.ERROR)
- return status;
-
- if (severity==Status.WARNING)
- {
- Choice result = env_.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
- if (result.getLabel().equals(CancelChoice.getLabel()))
- {
- //return an error status since the user canceled
- return StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_SAMPLE_CREATION_CANCELED );
- }
- status = Status.OK_STATUS; // user says it's OK
- }
- //
- return status;
- }
-
- /**
- * Determine if the given javaClass has a default constructor.
- * @param javaClass The java class
- * @return true if javaClass has a default constructor, false otherwise
- */
- private boolean hasDefaultConstructor(JavaClass javaClass) {
-
- List methods = javaClass.getMethods();
- Iterator iter = methods.iterator();
-
- boolean foundConstructor = false;
-
- while (iter.hasNext()) {
- Method method = (Method) iter.next();
-
- if (method.getName().equals(javaClass.getName())) {
- if (method.listParametersWithoutReturn().length == 0)
- return method.getJavaVisibility().getValue() == JavaVisibilityKind.PUBLIC;
- foundConstructor = true;
- }
- }
-
- // if no constructor is found at this point, a default one is implicitly provided
- return !foundConstructor;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/VisitorActionImpl.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/VisitorActionImpl.java
deleted file mode 100644
index fe4a2e3..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/VisitorActionImpl.java
+++ /dev/null
@@ -1,94 +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.consumption.codegen.javamofvisitoractions;
-
-import java.util.Vector;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.osgi.util.NLS;
-
-
-
-
-
-/**
-* Objects of this class represent a VisitorAction.
-* It will automatically walk the methods in the JavaClass
-* */
-public abstract class VisitorActionImpl implements VisitorAction
-{
-
- private Vector beansVisited = null;
- private Vector messages = null;
-
- public VisitorActionImpl( Vector messages, Vector beansVisited)
- {
- this.messages = messages;
- this.beansVisited = beansVisited;
- }
-
- public void initialize(String resident)
- {
- //nothing to be done but must be implemented
- }
-
- /**
- * Returns the vector of all messages found
- */
- public Vector getMessages ()
- {
- if (messages == null)
- messages = new Vector();
- return messages;
- }
-
- public Vector getBeansVisited()
- {
- if ( beansVisited == null)
- beansVisited = new Vector();
- return beansVisited;
- }
-
- public void addVisitedBean( JavaClass bean)
- {
- if ( beansVisited == null)
- beansVisited = new Vector();
- beansVisited.add(bean);
- }
-
- public boolean isBeanVisited (JavaClass bean)
- {
- return (beansVisited != null && beansVisited.contains(bean));
- }
-
- /**
- * sets the visitor that calls the visit
- * @parameter Visitor
- */
-
- public void setVisitor(Visitor visitor)
- {
- }
-
- protected void addMessage ( String key )
- {
- getMessages().add(key);
- }
-
- protected void addMessage ( String key, Object[] args )
- {
- getMessages().add(NLS.bind(key,args));
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofAttributeVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofAttributeVisitor.java
deleted file mode 100644
index 0c52993..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofAttributeVisitor.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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
- * -------- -------- -----------------------------------------------------------
- * 20080505 182167 makandre@ca.ibm.com - Andrew Mak, Warning not issued when non-instantiable class is bypassed in sampe JSPs
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.jst.ws.internal.consumption.command.common.JavaMofReflectionCommand;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.common.SamplePropertyDescriptor;
-import org.eclipse.wst.common.environment.IEnvironment;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class JavaMofAttributeVisitor implements Visitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- private String clientProject;
- private boolean returnParameter;
- private IEnvironment env;
-
-
- public void setEnvironment(IEnvironment env)
- {
- this.env = env;
- }
-
- /*
- * Use this to reflect
- */
- public void setProject(String clientProject)
- {
- this.clientProject = clientProject;
- }
-
- /*
- * Use this to reflect
- */
- public String getProject()
- {
- return clientProject;
- }
-
- public void setReturnParameter(boolean returnParameter)
- {
- this.returnParameter = returnParameter;
- }
-
-
- /*
- * Get the attribute belonging to this complex type
- * @param JavaParameter javaParameter that owns the type
- * @param VisitorAction Action to be performed on each method
- **/
- public IStatus run ( Object javaclass, VisitorAction vAction)
- {
- IStatus status = Status.OK_STATUS;
- JavaClass javaClass = (JavaClass)javaclass;
-
- Hashtable spdMap = new Hashtable();
- for (Iterator m=javaClass.getPublicMethods().iterator(); m.hasNext(); ) {
- Method method=(Method)m.next();
- if (((method.getMethodElementSignature().startsWith("get")
- || method.getMethodElementSignature().startsWith("is"))
- && method.listParametersWithoutReturn().length == 0 )
- || (method.getMethodElementSignature().startsWith("set")
- && method.listParametersWithoutReturn().length > 0)) {
- int sub = 3;
- if(method.getMethodElementSignature().startsWith("is"))
- sub = 2;
- String propertyName = method.getMethodElementSignature().substring(sub);
- String lower = propertyName.substring(0,1).toLowerCase();
- String remainder = propertyName.substring(1);
- propertyName = lower + remainder;
- int index = propertyName.lastIndexOf("(");
- String temp = propertyName;
- propertyName = temp.substring(0,index);
-
- //find the propertydescriptor
- SamplePropertyDescriptor spd = (SamplePropertyDescriptor)spdMap.get(propertyName);
- if(spd == null){
- spd = new SamplePropertyDescriptor(propertyName);
- spdMap.put(propertyName,spd);
- }
- if(method.getMethodElementSignature().startsWith("set"))
- spd.setWriteMethod(method);
- else
- spd.setReadMethod(method);
-
- Field field = javaClass.getFieldNamed(propertyName);
- JavaHelpers propertyType = null;
- if(field != null){
- propertyType = (JavaHelpers)field.getEType();
- spd.setfStatic(field.isStatic());
- }
- else{
- if(method.getMethodElementSignature().startsWith("get") || method.getMethodElementSignature().startsWith("is"))
- propertyType = method.getReturnType();
- else{
- JavaParameter params[] = method.listParametersWithoutReturn();
- propertyType = params[0].getJavaType();
- }
- }
-
- spd.setPropertyType(propertyType);
-
- }
- }
- Enumeration spdEnum = spdMap.elements();
- while(spdEnum.hasMoreElements()){
- SamplePropertyDescriptor spd = (SamplePropertyDescriptor)spdEnum.nextElement();
- if(spdCheck(spd)) {
- status = vAction.visit(spd);
- if (status.getSeverity() == IStatus.ERROR)
- break;
- }
- }
-
- return status;
-
- }
-
- private boolean spdCheck(SamplePropertyDescriptor spd)
- {
- //check for indexed properties
- Method writeMethod = spd.getWriteMethod();
- if(writeMethod != null)
- if(writeMethod.listParametersWithoutReturn().length > 1) return false;
-
- if(spd.getPropertyType() == null) return false;
- if(spd.getPropertyType().isPrimitive()) return true;
- if(returnParameter && TypeFactory.isRecognizedReturnType(spd.getPropertyType())) return true;
- if(!returnParameter && TypeFactory.isUnSupportedType(spd.getPropertyType())) return true;
- if(!checkPolarity(spd)) return false;
-
- // so its a bean make sure it has a default constructor
- JavaMofReflectionCommand javaMofRef = new JavaMofReflectionCommand();
- javaMofRef.setClientProject(getProject());
- javaMofRef.setProxyBean(((JavaHelpers)spd.getPropertyType()).getQualifiedName());
- javaMofRef.setEnvironment( env );
- javaMofRef.execute(null, null);
- if(javaMofRef.getJavaClass() instanceof JavaClass){
- if(TypeFactory.recognizedBean(javaMofRef.getJavaClass().getJavaName())) return true;
- return defaultCheck((JavaClass)javaMofRef.getJavaClass());
-
- }
- return true;
-
- }
-
- private boolean checkPolarity(SamplePropertyDescriptor spd){
-
- Method readMethod = spd.getReadMethod();
- Method writeMethod = spd.getWriteMethod();
- if((readMethod == null && writeMethod != null) || (readMethod != null && writeMethod == null))
- return true;
- if(readMethod == null && writeMethod == null)
- return false;
-
- JavaParameter javaParameter[] = writeMethod.listParametersWithoutReturn();
- for(int i = 0;i< javaParameter.length;i++){
- JavaParameter jp = javaParameter[i];
- jp.getJavaType().getJavaName();
- readMethod.getReturnType().getJavaName();
- if(jp.getJavaType().getJavaName().equals(readMethod.getReturnType().getJavaName()))
- return true;
- }
- return false;
- }
-
- private boolean defaultCheck(JavaClass javaClass){
-
- Iterator m=javaClass.getMethods().iterator();
- //now check for a default constructor
- boolean defaultConst = true;
- while (m.hasNext()) {
- Method method=(Method)m.next();
- if (javaClass.getName().equals(method.getName())){
- //now the inputs
- JavaParameter javaParameter[] = method.listParametersWithoutReturn();
- if (javaParameter.length > 0){
- //then we have no default constructor
- defaultConst = false;
- }
- else if(javaParameter.length == 0){
- if (method.getJavaVisibility().getValue() == 0)
- return true;
- }
- }
- }
-
- return defaultConst;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofBeanVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofBeanVisitor.java
deleted file mode 100644
index 773abb2..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofBeanVisitor.java
+++ /dev/null
@@ -1,45 +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.consumption.codegen.javamofvisitors;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-
-
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class JavaMofBeanVisitor implements Visitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /*
- *Constructor
- **/
- public JavaMofBeanVisitor()
- {
- }
-
- public IStatus run ( Object javaClass, VisitorAction vAction)
- {
- return vAction.visit((JavaClass)javaClass);
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofFieldVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofFieldVisitor.java
deleted file mode 100644
index 7f0f0eb..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofFieldVisitor.java
+++ /dev/null
@@ -1,139 +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.consumption.codegen.javamofvisitors;
-
-import java.util.Iterator;
-import java.util.ListIterator;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jem.java.Field;
-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.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.jst.ws.internal.consumption.command.common.JavaMofReflectionCommand;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class JavaMofFieldVisitor implements Visitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- private String clientProject;
-
- /*
- * Constructor
- **/
- public JavaMofFieldVisitor()
- {
- }
-
- /*
- * Use this to reflect
- */
- public void setProject(String clientProject)
- {
- this.clientProject = clientProject;
- }
-
- /*
- * Use this to reflect
- */
- public String getProject()
- {
- return clientProject;
- }
-
- /*
- * Get the attribute belonging to this complex type
- * @param JavaParameter javaParameter that owns the type
- * @param VisitorAction Action to be performed on each method
- **/
- public IStatus run ( Object javaclass, VisitorAction vAction)
- {
- IStatus status = Status.OK_STATUS;
- JavaClass javaClass = (JavaClass)javaclass;
-
- boolean holderClass = false;
- EList implemented = javaClass.getImplementsInterfaces();
- for (int i = 0; i < implemented.size(); i++) {
- JavaClass anInterface = (JavaClass) implemented.get(i);
- if (anInterface.getQualifiedName().equals("javax.xml.rpc.holders.Holder"))
- holderClass = true;
- }
-
- //beaninfo code
- if(holderClass){
- EList e = javaClass.getFields();
- ListIterator list = e.listIterator();
- while(list.hasNext()){
- Field field = (Field)list.next();
- if(field.getJavaVisibility().getValue() == JavaVisibilityKind.PUBLIC && !field.isFinal() && !field.isStatic()){
- if(fieldCheck(field))
- status = vAction.visit(field);
- }
- }
- }
-
- return status;
- }
- private boolean fieldCheck(Field field)
- {
- // so its a bean make sure it has a default constructor
- JavaMofReflectionCommand javaMofRef = new JavaMofReflectionCommand();
- javaMofRef.setProxyBean(((JavaHelpers)field.getEType()).getQualifiedName());
- javaMofRef.setClientProject(getProject());
- javaMofRef.execute(null, null);
- if(javaMofRef.getJavaClass() instanceof JavaClass){
- if(TypeFactory.recognizedBean(javaMofRef.getJavaClass().getJavaName())) return true;
- return defaultCheck((JavaClass)javaMofRef.getJavaClass());
- }
- return true;
- }
-
- private boolean defaultCheck(JavaClass javaClass){
-
- Iterator m=javaClass.getMethods().iterator();
- //now check for a default constructor
- boolean defaultConst = true;
- while (m.hasNext()) {
- Method method=(Method)m.next();
- if (javaClass.getName().equals(method.getName())){
- //now the inputs
- JavaParameter javaParameter[] = method.listParametersWithoutReturn();
- if (javaParameter.length > 0){
- //then we have no default constructor
- defaultConst = false;
- }
- else if(javaParameter.length == 0){
- if (method.getJavaVisibility().getValue() == 0)
- return true;
- else if(method.getJavaVisibility().getValue() == 1)
- defaultConst = false;
- }
- }
- }
-
- return defaultConst;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofMethodVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofMethodVisitor.java
deleted file mode 100644
index d32ee8d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofMethodVisitor.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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
- * -------- -------- -----------------------------------------------------------
- * 20080505 182167 makandre@ca.ibm.com - Andrew Mak, Warning not issued when non-instantiable class is bypassed in sampe JSPs
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors;
-
-import java.util.Iterator;
-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.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.wst.command.internal.env.core.selection.BooleanSelection;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class JavaMofMethodVisitor implements Visitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- public String SET_ENDPOINT = "setEndPoint";
- public String GET_ENDPOINT = "getEndPoint";
- private BooleanSelection[] fMethodsSelected;
-
-
- /*
- * Constructor
- **/
- public JavaMofMethodVisitor()
- {
- }
-
- public String UNDER_SCORE = "_";
-
- /*
- * Run through all the methods in this bean
- * @param JavaClass javaclass that holds the methods
- * @param VisitorAction Action to be performed on each method
- **/
- public IStatus run ( Object javaclass, VisitorAction vAction)
- {
- IStatus status = Status.OK_STATUS;
- JavaClass javaClass = (JavaClass)javaclass;
- for (Iterator m=javaClass.getPublicMethods().iterator(); m.hasNext(); ) {
- Method method=(Method)m.next();
- if(fMethodsSelected != null) {
- boolean methodSelected = false;
- for(int i =0;i < fMethodsSelected.length;i++){
- if(fMethodsSelected[i] == null) continue;
- if ( fMethodsSelected[i].getValue().equals(method.getMethodElementSignature()))
- methodSelected = (boolean) fMethodsSelected[i].isSelected();
- }
-
- method.getName();
-
- if(methodSelected) {
- status = vAction.visit(method);
- if (status.getSeverity() == IStatus.ERROR)
- break;
- }
- }
- else {
- status = vAction.visit(method);
- }
-
- }
- return status;
- }
-
- public void setMethodSelection(BooleanSelection[] methodSelected)
- {
- fMethodsSelected = methodSelected;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofParameterVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofParameterVisitor.java
deleted file mode 100644
index 74904b6..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofParameterVisitor.java
+++ /dev/null
@@ -1,108 +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.consumption.codegen.javamofvisitors;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Choice;
-import org.eclipse.wst.common.environment.IEnvironment;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class JavaMofParameterVisitor implements Visitor
-{
- private IEnvironment env_;
-
- /*
- * Constructor
- **/
- public JavaMofParameterVisitor(IEnvironment env)
- {
- env_ = env;
- }
-
- /*
- * Run through all the parameters in this method
- * @param JavaClass javaclass that holds the parameters
- * @param VisitorAction Action to be performed on each method
- **/
- public IStatus run ( Object imethod, VisitorAction vAction)
- {
- IStatus status = Status.OK_STATUS;
- Choice OKChoice = new Choice('O', ConsumptionMessages.LABEL_OK, ConsumptionMessages.DESCRIPTION_OK);
- Choice CancelChoice = new Choice('C', ConsumptionMessages.LABEL_CANCEL, ConsumptionMessages.DESCRIPTION_CANCEL);
- Method method = (Method)imethod;
-
- JavaHelpers javaReturnParameter = method.getReturnType();
- //pgm This visitor used to take a JavaParameter type and now it is being called
- // with a JavaHelpers type. Gil, please ensure that this is Ok.
- status = vAction.visit(javaReturnParameter);
- //
- int severity = status.getSeverity();
- if (severity==Status.ERROR)
- return status;
-
- if (severity==Status.WARNING)
- {
- Choice result = env_.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
- if (result.getLabel().equals(CancelChoice.getLabel()))
- {
- //return an error status since the user canceled
- return StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_SAMPLE_CREATION_CANCELED );
- }
-
- }
- //
-
- //now the inputs
- List parameters = method.getParameters();
-
- for (int index = 0; index < parameters.size(); index++)
- {
- JavaParameter param=(JavaParameter)parameters.get(index);
- status = vAction.visit(param);
- //
- severity = status.getSeverity();
- if (severity==Status.ERROR)
- return status;
-
- if (severity==Status.WARNING)
- {
- Choice result = env_.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
- if (result.getLabel().equals(CancelChoice.getLabel()))
- {
- //return an error status since the user canceled
- return StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_SAMPLE_CREATION_CANCELED );
- }
-
- }
- //
- }
-
- return status;
-
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofTypeVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofTypeVisitor.java
deleted file mode 100644
index 118fc86..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofTypeVisitor.java
+++ /dev/null
@@ -1,112 +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.consumption.codegen.javamofvisitors;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.jst.ws.internal.consumption.command.common.JavaMofReflectionCommand;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.common.SamplePropertyDescriptor;
-import org.eclipse.wst.common.environment.IEnvironment;
-
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class JavaMofTypeVisitor implements Visitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- private IEnvironment env_;
-
- private String clientProject;
-
- /*
- * Constructor
- **/
- public JavaMofTypeVisitor(IEnvironment env)
- {
- env_ = env;
- }
-
- /*
- * Use this to reflect
- */
- public void setClientProject(String clientProject)
- {
- this.clientProject = clientProject;
- }
-
- /*
- * Use this to reflect
- */
- public String getClientProject()
- {
- return clientProject;
- }
-
- /*
- * Get the type belonging to the parameter
- * @param JavaParameter javaParameter that owns the type
- * @param VisitorAction Action to be performed on each method
- **/
- public IStatus run ( Object typeNavigator, VisitorAction vAction)
- {
- IStatus status = Status.OK_STATUS;
- if (typeNavigator instanceof JavaParameter){
-
- JavaParameter javaParameter = (JavaParameter)typeNavigator;
- JavaHelpers javaHelpers = javaParameter.getJavaType();
- status = vAction.visit(javaHelpers);
- }
- else if (typeNavigator instanceof JavaHelpers){
- status = vAction.visit(typeNavigator);
- }
- else if (typeNavigator instanceof SamplePropertyDescriptor){
- SamplePropertyDescriptor pd = (SamplePropertyDescriptor)typeNavigator;
- JavaMofReflectionCommand javaMofRef = new JavaMofReflectionCommand();
- javaMofRef.setClientProject(clientProject);
- javaMofRef.setProxyBean(((JavaHelpers)pd.getPropertyType()).getQualifiedName());
- javaMofRef.setEnvironment( env_ );
- status = javaMofRef.execute( null, null );
- if (status.getSeverity()==Status.ERROR)
- return status;
-
- status = vAction.visit(javaMofRef.getJavaClass());
- }
- else if (typeNavigator instanceof Field){
- Field field = (Field)typeNavigator;
- JavaMofReflectionCommand javaMofRef = new JavaMofReflectionCommand();
- javaMofRef.setClientProject(clientProject);
- javaMofRef.setProxyBean(((JavaHelpers)field.getEType()).getQualifiedName());
- javaMofRef.setEnvironment( env_ );
-
- status = javaMofRef.execute( null, null );
- if (status.getSeverity()==Status.ERROR)
- return status;
-
- status = vAction.visit(javaMofRef.getJavaClass());
- }
-
- return status;
- }
-
-
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AbstractStartServer.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AbstractStartServer.java
deleted file mode 100644
index ff98bd4..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AbstractStartServer.java
+++ /dev/null
@@ -1,141 +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.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.server.core.IServer;
-
-public abstract class AbstractStartServer {
-
-protected IProgressMonitor monitor;
-private ILog log_;
-
-public AbstractStartServer()
-{
- log_ = EnvironmentService.getEclipseLog();
-}
-
-/**
- * Execute the command
- */
-public void StartServer (IProject project, IServer server, IProgressMonitor monitor, boolean restart) throws CoreException
-{
- this.monitor = monitor;
-
- try
- {
-
-// IJavaServer javaServer = (IJavaServer) server.getDelegate();
-// addJarsToClassPath(javaServer);
- validateRemoteServerPath(server);
-
- if (server.getServerState() != IServer.STATE_STOPPED) // The Server is running
- {
- if (server.getServerRestartState())
- {
-
- server.synchronousStop(false);
- log_.log(ILog.INFO, 5050, this, "StartServer", "project="+project+", Stop command completed, restart needed");
- publishProject(server);
- startProject(server);
- }
- else
- {
-
- if (restart) // WEB-INF\lib need to be reloaded
- {
- publishProject(server);
- restartProject(project, server);
- }
- }
- }
- else {
-
- publishProject(server);
- startProject(server);
- }
-}
-
- catch (CoreException ce) {
- throw ce;
- }
- catch (Exception e) {
- throw new CoreException(new Status(IStatus.ERROR,WebServiceConsumptionPlugin.ID,0,ConsumptionMessages.MSG_ERROR_SERVER,e));
- }
-}
-
-protected void publishProject(IServer server) throws CoreException
-{
- monitor.subTask( ConsumptionMessages.PROGRESS_INFO_PUBLISHING_SERVER );
- ServerPublishOperationListener publishListener = new ServerPublishOperationListener();
- server.publish(IServer.PUBLISH_INCREMENTAL,null,null,publishListener);
- IStatus publishStatus = publishListener.getPublishStatus();
- if (publishStatus.getSeverity() != IStatus.OK)
- throw new CoreException(publishStatus);
- log_.log(ILog.INFO, 5051, this, "publishProject", "IServer="+server+", Publish command completed");
- }
-
-protected void startProject(IServer server) throws CoreException
-{
- try
- {
- monitor.subTask( ConsumptionMessages.PROGRESS_INFO_STARTING_SERVER );
- server.synchronousStart(ILaunchManager.RUN_MODE, monitor);
- log_.log(ILog.INFO, 5052, this, "startProject", "IServer="+server+", Start command completed");
-
- }
- catch (Exception e) {
- throw new CoreException(new Status(IStatus.ERROR,WebServiceConsumptionPlugin.ID,0,ConsumptionMessages.MSG_ERROR_SERVER,e));
- }
-}
-
-protected void restartProject(IProject project, IServer server) throws CoreException
-{
- //Do nothing
-}
-
-public void runPreServerConfig(IServer server, IProject EARProject){
-
- return;
-
-}
-
-public void runPostServerConfig(IServer server, IProject EARProject){
-
- return;
-}
-
-
-protected abstract void addJarsToClassPath(IServer server) throws CoreException;
-protected abstract void validateRemoteServerPath(IServer server) throws CoreException;
-
-public void stopServer(IServer server) throws CoreException {
-
- if (server != null) {
-
- if (server.getServerState() != IServer.STATE_STOPPED) {
- server.synchronousStop(false);
- }
- }
-
-}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AddModuleToServerCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AddModuleToServerCommand.java
deleted file mode 100644
index 7ab6688..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AddModuleToServerCommand.java
+++ /dev/null
@@ -1,163 +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
- * -------- -------- -----------------------------------------------------------
- * 20060921 [158210] kathy@ca.ibm.com - Kathy Chan, Calling incremental build on the project before adding to server
- * 20080415 227237 gilberta@ca.ibm.com - Gilbert Andrews
- * 20090311 250984 mahutch@ca.ibm.com - Mark Hutchinson, Use another mechanism to wait for build to be completed
- * 20090518 [252077] tangg@emc.com - Gary Tang, Fail to deploy an EAR project if it contains a module
- * kchong@ca.ibm.com - Keith Chong, (updated patch)
- * 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.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-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.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-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.IModule;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerUtil;
-
-public class AddModuleToServerCommand extends AbstractDataModelOperation
-{
-
- private String serverInstanceId;
- private String moduleProjectName = null;
- private String earProjectName = null;
- private String module = null;
- private String earModule = null;
-
- public AddModuleToServerCommand()
- {
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
-
- IStatus status = Status.OK_STATUS;
- IServer server = null;
- if(!(serverInstanceId == null))
- server = ServerCore.findServer(serverInstanceId);
- if (server == null)
- {
- status = StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_INSTANCE_NOT_FOUND );
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- IServerWorkingCopy serverwc = null;
-
- try
- {
- //Ensure the module is not a Java utility
- IProject moduleProject = ProjectUtilities.getProject(moduleProjectName);
- if (!J2EEUtils.isJavaComponent(moduleProject))
- {
- IProject projectToAdd = null;
- IModule moduleToAdd;
- if (earProjectName != null && earModule != null && earProjectName.length() > 0 && earModule.length() > 0)
- {
- //if there is an EAR, that is what we want to publish
- projectToAdd = ProjectUtilities.getProject(earProjectName);
- // Get the IModule as specified by the module name
- moduleToAdd = ServerUtils.getModule(projectToAdd, earModule);
- } else {
- //if there is no EAR then we try and publish the module
- projectToAdd = moduleProject;
- // Get the IModule as specified by the module name
- moduleToAdd = ServerUtils.getModule(projectToAdd, module);
- }
-
- // TODO: This workaround for 156768 should be removed once the defect is fixed
- if (moduleToAdd == null) {
- // calling incremental build on the project before trying again
- projectToAdd.build(IncrementalProjectBuilder.INCREMENTAL_BUILD,null);
- moduleToAdd = ServerUtils.getModule(projectToAdd);
- if (moduleToAdd == null) {
- // return error if module is still null after 1 retry
- status = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_ADD_MODULE, new String[]{module}) );
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
- // end of workaround for 156768
-
- if (!ServerUtil.containsModule(server, moduleToAdd, null))
- {
- IModule[] imodules = new IModule[]{moduleToAdd};
- serverwc = server.createWorkingCopy();
- ServerUtil.modifyModules(serverwc, imodules, null, null);
- }
- }
- } catch (CoreException e)
- {
- status = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_ADD_MODULE, new String[]{module}), e);
- env.getStatusHandler().reportError(status);
- return status;
- } finally
- {
- try
- {
- if (serverwc != null)
- {
- serverwc.save(true, null);
- }
- } catch (CoreException ce)
- {
- status = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_ADD_MODULE, new String[] { module }), ce);
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
-
- return status;
- }
-
- public void setModule(String module)
- {
- this.module = module;
- }
-
- public void setProject(String project)
- {
- this.moduleProjectName = project;
- }
-
- public void setEarProject(String earProject)
- {
- this.earProjectName = earProject;
- }
-
- public void setEarModule(String earModule)
- {
- this.earModule = earModule;
- }
-
- public void setServerInstanceId(String serverInstanceId)
- {
- this.serverInstanceId = serverInstanceId;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AssociateModuleWithEARCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AssociateModuleWithEARCommand.java
deleted file mode 100644
index 82ab8a3..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AssociateModuleWithEARCommand.java
+++ /dev/null
@@ -1,89 +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.consumption.command.common;
-
-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.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-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 AssociateModuleWithEARCommand extends AbstractDataModelOperation
-{
- private String project_;
- private String module_;
- private String earProject_;
- private String ear_;
-
-
- public AssociateModuleWithEARCommand(){
-
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
-
- IStatus status = Status.OK_STATUS;
- IProject moduleProject = null;
- IProject earProject = null;
-
- // get projects
- if (project_!=null)
- moduleProject = ProjectUtilities.getProject(project_);
- if (earProject_!=null)
- earProject = ProjectUtilities.getProject(earProject_);
-
- // associate modules if not already associated
- if (moduleProject!=null && earProject!=null) {
- if (!J2EEUtils.isComponentAssociated(earProject, moduleProject))
- J2EEUtils.associateComponentToEAR(moduleProject, earProject);
- }
-
- // ensure modules are associated otherwise report error
- if (!J2EEUtils.isComponentAssociated(earProject, moduleProject)){
- status = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_UNABLE_TO_ASSOCIATE, new String[]{module_, ear_}) );
- if (env!=null)
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- return 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;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/BuildBeanCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/BuildBeanCommand.java
deleted file mode 100644
index f04f119..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/BuildBeanCommand.java
+++ /dev/null
@@ -1,63 +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
- * -------- -------- -----------------------------------------------------------
- * 20081111 252062 mahutch@ca.ibm.com - Mark Hutchinson, Don't depend on AutoBuild to compile bean
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-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.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class BuildBeanCommand extends AbstractDataModelOperation {
-
- private IProject project_;
-
- /*
- * This Command builds the service project, and all projects it references. This is different from the
- * BuildProjectCommand which only builds the service project
- */
- public BuildBeanCommand() {
- //default constructor
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- IProject[] referencedProjects;
-
- try {
- referencedProjects = project_.getReferencedProjects();
- for (int i = 0; i < referencedProjects.length; i++) {
- referencedProjects[i].build(IncrementalProjectBuilder.INCREMENTAL_BUILD, monitor);
- }
- project_.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, monitor);
-
- } catch (Exception e) {
- return StatusUtils.errorStatus(e);
- }
- return Status.OK_STATUS;
- }
-
-
- /**
- * @param project the service project to be built.
- */
- public void setProject(IProject project) {
- this.project_ = project;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/BuildProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/BuildProjectCommand.java
deleted file mode 100644
index 9c6f925..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/BuildProjectCommand.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20090311 250984 mahutch@ca.ibm.com - Mark Hutchinson, Use another mechanism to wait for build to be completed
- * 20120409 376345 yenlu@ca.ibm.com, kchong@ca.ibm.com - Stability improvements to web services commands/operations
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-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.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class BuildProjectCommand extends AbstractDataModelOperation
-{
- private ValidationManager validationManager;
- private IProject project_;
- private boolean forceBuild_;
- // rm private Model model;
-
- /**
- * Default CTOR;
- */
- public BuildProjectCommand()
- {
- }
-
- /**
- * Execute the command
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- try
- {
- ResourcesPlugin.getWorkspace().run(new BuildProjectOperation(),monitor);
- }
- catch (CoreException e)
- {
- return e.getStatus();
- }
- return Status.OK_STATUS;
- }
-
- private class BuildProjectOperation implements IWorkspaceRunnable
- {
- public void run(IProgressMonitor arg0) throws CoreException {
-
- if (forceBuild_)
- project_.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
- else if (validationManager == null)
- project_.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
- else if (validationManager.getWorkspaceAutoBuildPreference())
- project_.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
- }
- }
-
- /**
- * @param forceBuild The forceBuild to set.
- */
- public void setForceBuild(boolean forceBuild) {
- this.forceBuild_ = forceBuild;
- }
-
- /**
- * @param project The project to set.
- */
- public void setProject(IProject project) {
- this.project_ = project;
- }
-
- /**
- * @param validationManager The validationManager to set.
- */
- public void setValidationManager(ValidationManager validationManager) {
- this.validationManager = validationManager;
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CheckProjectOKCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CheckProjectOKCommand.java
deleted file mode 100644
index 681f3b9..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CheckProjectOKCommand.java
+++ /dev/null
@@ -1,76 +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.consumption.command.common;
-
-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.ConsumptionMessages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-
-public class CheckProjectOKCommand extends AbstractDataModelOperation
-{
-
- private String serviceServerTypeId_;
-
-
- /**
- * Default CTOR
- */
- public CheckProjectOKCommand() {
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IStatus status = Status.OK_STATUS;
-
- String typeid = serviceServerTypeId_;
- IServer[] servers = ServerCore.getServers();
-// Iterator iterator = servers.iterator();
- boolean viewOpen = false;
- String serverName = null;
-
- for (int i=0;i<servers.length;i++) {
- IServer server = (IServer) servers[i];
-
- // If the configuration editor is open for the server that we are
- // deploying
- // to we will prompt the user to close it.
- if (server != null && server.getServerType().getId().equals(typeid)) {
- viewOpen = true;
- serverName = server.getName();
- break;
- }
- }
-
- if (viewOpen) {
- String errorMessage = NLS.bind(ConsumptionMessages.MSG_ERROR_SERVER_VIEW_OPEN, new String[] { serverName});
- return StatusUtils.errorStatus( errorMessage );
-
- }
-
- return status;
- }
-
- /**
- * @param serviceServerId
- * The serviceServer factory Id to set.
- */
- public void setServiceServerTypeID(String serviceServerId) {
- this.serviceServerTypeId_ = serviceServerId;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ComputeEndpointCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ComputeEndpointCommand.java
deleted file mode 100644
index 579f7d2..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ComputeEndpointCommand.java
+++ /dev/null
@@ -1,148 +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
- * -------- -------- -----------------------------------------------------------
- * 20080613 237116 makandre@ca.ibm.com - Andrew Mak, Web service monitoring fails on https endpoint
- * 20080715 240722 makandre@ca.ibm.com - Andrew Mak, Cannot setup TCP/IP Monitor for soap12 endpoints
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Iterator;
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.monitor.ExtensibilityElementTransformerRegistry;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-public class ComputeEndpointCommand extends AbstractDataModelOperation
-{
- private WebServicesParser webServicesParser;
- private String wsdlURI;
- private Boolean monitorService;
- private Integer monitoredPort;
-
- public ComputeEndpointCommand()
- {
- }
-
- /**
- * @param monitoredPort The monitoredPort to set.
- */
- public void setMonitoredPort(Integer monitoredPort)
- {
- this.monitoredPort = monitoredPort;
- }
- /**
- * @param monitorService The monitorService to set.
- */
- public void setMonitorService(Boolean monitorService)
- {
- this.monitorService = monitorService;
- }
- /**
- * @param webServicesParser The webServicesParser to set.
- */
- public void setWebServicesParser(WebServicesParser webServicesParser)
- {
- this.webServicesParser = webServicesParser;
- }
- /**
- * @param wsdlURI The wsdlURI to set.
- */
- public void setWsdlURI(String wsdlURI)
- {
- this.wsdlURI = wsdlURI;
- }
-
- public String getEndpoint()
- {
- if (monitorService != null && monitorService.booleanValue() && monitoredPort != null)
- {
- Definition def = webServicesParser.getWSDLDefinition(wsdlURI);
- if (def != null)
- {
- for (Iterator it = def.getServices().values().iterator(); it.hasNext();)
- {
- Service service = (Service)it.next();
- for (Iterator it2 = service.getPorts().values().iterator(); it2.hasNext();)
- {
- Port port = (Port)it2.next();
- for (Iterator it3 = port.getExtensibilityElements().iterator(); it3.hasNext();)
- {
- ExtensibilityElement ext = (ExtensibilityElement)it3.next();
- String location = null;
- if (ext instanceof SOAPAddress)
- location = ((SOAPAddress)ext).getLocationURI();
- else
- location = ExtensibilityElementTransformerRegistry.INSTANCE.transform(ext);
- if (location != null)
- {
- if (location.startsWith("https://"))
- location = "http://" + location.substring(8);
- try
- {
- URL url = new URL(location);
- url = new URL(url.getProtocol(), url.getHost(), monitoredPort.intValue(), url.getFile());
- return url.toString();
- }
- catch (MalformedURLException murle)
- {
- int protocolIndex = location.indexOf("://");
- if (protocolIndex != -1)
- {
- String protocol = location.substring(0, protocolIndex+3);
- int hostPortIndex = location.indexOf('/', protocolIndex+3);
- String file;
- if (hostPortIndex == -1)
- {
- hostPortIndex = location.length();
- file = "";
- }
- else
- file = location.substring(hostPortIndex, location.length());
- String hostPort = location.substring(protocolIndex+3, hostPortIndex);
- int hostIndex = hostPort.indexOf(':');
- String host;
- if (hostIndex != -1)
- host = hostPort.substring(0, hostIndex+1);
- else
- host = hostPort + ':';
- String newPort = String.valueOf(monitoredPort.intValue());
- StringBuffer endpoint = new StringBuffer(protocol);
- endpoint.append(host);
- endpoint.append(newPort);
- endpoint.append(file);
- return endpoint.toString();
- }
- }
- }
- }
- }
- }
- }
- }
- return null;
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
- {
- return Status.OK_STATUS;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ComputeProxyEndpointCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ComputeProxyEndpointCommand.java
deleted file mode 100644
index c99346d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ComputeProxyEndpointCommand.java
+++ /dev/null
@@ -1,122 +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
- * -------- -------- -----------------------------------------------------------
- * 20060728 145426 kathy@ca.ibm.com - Kathy Chan
- * 20080613 237116 makandre@ca.ibm.com - Andrew Mak, Web service monitoring fails on https endpoint
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class ComputeProxyEndpointCommand extends AbstractDataModelOperation
-{
- private Boolean monitorService;
- private Integer monitoredPort;
- private String proxyEndpoint;
- private String endpoint;
-
- public ComputeProxyEndpointCommand()
- {
- }
-
- /**
- * @param monitoredPort The monitoredPort to set.
- */
- public void setMonitoredPort(Integer monitoredPort)
- {
- this.monitoredPort = monitoredPort;
- }
- /**
- * @param monitorService The monitorService to set.
- */
- public void setMonitorService(Boolean monitorService)
- {
- this.monitorService = monitorService;
- }
-
- public String getEndpoint()
- {
- if (monitorService != null && monitorService.booleanValue() && monitoredPort != null)
- {
- // Use the endpoint that matches with the proxy the extension passes to us if it is set
- if (proxyEndpoint != null) {
- String location = proxyEndpoint;
- if (location.startsWith("https://"))
- location = "http://" + location.substring(8);
- try
- {
- URL url = new URL(location);
- url = new URL(url.getProtocol(), url.getHost(), monitoredPort.intValue(), url.getFile());
- return url.toString();
- }
- catch (MalformedURLException murle)
- {
- int protocolIndex = location.indexOf("://");
- if (protocolIndex != -1)
- {
- String protocol = location.substring(0, protocolIndex+3);
- int hostPortIndex = location.indexOf('/', protocolIndex+3);
- String file;
- if (hostPortIndex == -1)
- {
- hostPortIndex = location.length();
- file = "";
- }
- else
- file = location.substring(hostPortIndex, location.length());
- String hostPort = location.substring(protocolIndex+3, hostPortIndex);
- int hostIndex = hostPort.indexOf(':');
- String host;
- if (hostIndex != -1)
- host = hostPort.substring(0, hostIndex+1);
- else
- host = hostPort + ':';
- String newPort = String.valueOf(monitoredPort.intValue());
- StringBuffer endpoint = new StringBuffer(protocol);
- endpoint.append(host);
- endpoint.append(newPort);
- endpoint.append(file);
- return endpoint.toString();
- }
- }
- } else {
- return endpoint;
- }
- }
- return null;
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
- {
- return Status.OK_STATUS;
- }
-
- /**
- * @param proxyEndpoint The proxyEndpoint to set.
- */
- public void setProxyEndpoint(String proxyEndpoint) {
- this.proxyEndpoint = proxyEndpoint;
- }
- /**
- * @param endpoint The endpoint to set.
- */
- public void setEndpoint(String endpoint) {
- this.endpoint = endpoint;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLCommand.java
deleted file mode 100644
index 6cb3103..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLCommand.java
+++ /dev/null
@@ -1,379 +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
- * -------- -------- -----------------------------------------------------------
- * 20061213 165723 kathy@ca.ibm.com - Kathy Chan
- * 20061213 165725 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Import;
-import javax.wsdl.Types;
-import javax.wsdl.WSDLException;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-import javax.wsdl.extensions.schema.Schema;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLWriter;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.eclipse.core.resources.IWorkspaceRunnable;
-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.emf.common.util.EList;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-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.uri.URIException;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.discovery.NetUtils;
-import org.eclipse.wst.ws.internal.parser.wsil.WWWAuthenticationException;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.wsdl.internal.impl.XSDSchemaExtensibilityElementImpl;
-import org.eclipse.wst.wsdl.internal.impl.wsdl4j.WSDLFactoryImpl;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSchemaDirective;
-import org.eclipse.xsd.impl.XSDSchemaImpl;
-import org.eclipse.xsd.util.XSDParser;
-import org.w3c.dom.Element;
-
-public class CopyWSDLCommand extends AbstractDataModelOperation
-{
- private String wsdlURI;
- private WebServicesParser webServicesParser;
- private String destinationURI;
- private Definition def;
- private Vector ignoreList;
-
- public CopyWSDLCommand()
- {
- }
-
- /**
- * Execute the command
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
- CopyWSDLRunnable copyWSDLRunnable = new CopyWSDLRunnable(env);
- try
- {
- ResourceUtils.getWorkspace().run(copyWSDLRunnable, null);
- return Status.OK_STATUS;
- }
- catch (CoreException ce)
- {
- IStatus status = ce.getStatus();
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
-
-
- private class CopyWSDLRunnable implements IWorkspaceRunnable {
-
- private IEnvironment environment = null;
-
- protected CopyWSDLRunnable(IEnvironment env){
- environment = env;
- }
- public void run(IProgressMonitor pm) throws CoreException {
- ignoreList = new Vector();
- if (def == null)
- def = webServicesParser.getWSDLDefinition(wsdlURI);
- try {
- copyWSDL(environment, wsdlURI, getBaseURI(destinationURI), getLocalname(destinationURI), def);
- } catch (Throwable e) {
- throw new CoreException(StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_COPY_WSDL, new String[]{wsdlURI, destinationURI}), e));
- }
- }
- }
- private void copyWSDL(IEnvironment env, String uri, String destURI, String destLocalname) throws WSDLException, IOException, WWWAuthenticationException, TransformerException, TransformerConfigurationException, URIException
- {
- Definition definition;
-
- try {
- definition = webServicesParser.getWSDLDefinitionVerbose(uri);
- copyWSDL(env, uri, destURI, destLocalname, definition);
- } catch (WSDLException e) {
- copyXMLSchema(env, uri, destURI);
- }
- }
-
- private void copyWSDL(IEnvironment env, String uri, String destURI, String destLocalname, Definition definition) throws WSDLException, IOException, WWWAuthenticationException, TransformerException, TransformerConfigurationException, URIException
- {
- uri = normalize(uri);
- if (!needToCopy(uri)) {
- return;
- }
- destURI = normalize(destURI);
- String baseURI = getBaseURI(uri);
- if (destLocalname == null || destLocalname.length() <= 0)
- destLocalname = getLocalname(uri);
-
- // copy WSDL
- StringBuffer destinationFileURI = new StringBuffer(addTrailingSeparator(destURI));
- destinationFileURI.append(destLocalname);
- WSDLFactory wsdlFactory = new WSDLFactoryImpl();
- WSDLWriter wsdlWriter = wsdlFactory.newWSDLWriter();
- OutputStream os = env.getURIFactory().newURI(destinationFileURI.toString()).getOutputStream();
- wsdlWriter.writeWSDL(definition, os);
- os.close();
- // copy <wsdl:import>s
- Map imports = definition.getImports();
- for (Iterator it = imports.values().iterator(); it.hasNext();)
- {
- List list = (List)it.next();
- for (Iterator listIt = list.iterator(); listIt.hasNext();)
- {
- Import wsdlImport = (Import)listIt.next();
- String wsdlImportURI = wsdlImport.getLocationURI();
- if (isRelative(wsdlImportURI))
- {
- String importBaseURI = (new StringBuffer(baseURI)).append(wsdlImportURI).toString();
- String wsdlImportBaseURI = getBaseURI(wsdlImportURI);
- StringBuffer importDestURI = new StringBuffer(destURI);
- if (wsdlImportBaseURI != null)
- importDestURI.append(wsdlImportBaseURI);
- copyWSDL(env, importBaseURI, importDestURI.toString(), getLocalname(wsdlImportURI));
- }
- }
- }
- Types types = definition.getTypes();
- if (types != null)
- {
- List schemas = types.getExtensibilityElements();
- for (Iterator it = schemas.iterator(); it.hasNext();)
- {
- ExtensibilityElement extElement = (ExtensibilityElement)it.next();
- if (extElement instanceof UnknownExtensibilityElement)
- {
- UnknownExtensibilityElement schemaElement = (UnknownExtensibilityElement)extElement;
- XSDSchema xsdSchema = null;
- try
- {
- xsdSchema = XSDSchemaImpl.createSchema(schemaElement.getElement());
- }
- catch (Throwable t)
- {
- // ignore any extensibility elements that cannot be parsed into a
- // XSDSchema instance
- }
- copyXMLSchema(env, xsdSchema, baseURI, destURI);
- }
- else if (extElement instanceof XSDSchemaExtensibilityElementImpl)
- {
- XSDSchemaExtensibilityElementImpl schemaElement = (XSDSchemaExtensibilityElementImpl)extElement;
- XSDSchema xsdSchema = null;
- try
- {
- xsdSchema = XSDSchemaImpl.createSchema(schemaElement.getElement());
- }
- catch (Throwable t)
- {
- // ignore any extensibility elements that cannot be parsed into a
- // XSDSchema instance
- }
- copyXMLSchema(env, xsdSchema, baseURI, destURI);
- }
- if (extElement instanceof Schema)
- {
- Schema schemaElement = (Schema)extElement;
- XSDSchema xsdSchema = null;
- try
- {
- xsdSchema = XSDSchemaImpl.createSchema(schemaElement.getElement());
- }
- catch (Throwable t)
- {
- // ignore any extensibility elements that cannot be parsed into a
- // XSDSchema instance
- }
- copyXMLSchema(env, xsdSchema, baseURI, destURI);
- }
- }
-
- }
- }
-
- private String getBaseURI(String uri)
- {
- int index = uri.lastIndexOf('/');
- if (index == -1)
- index = uri.lastIndexOf('\\');
- if (index != -1)
- return uri.substring(0, index + 1);
- else
- return null;
- }
-
- private String getLocalname(String uri)
- {
- int index = uri.lastIndexOf('/');
- if (index == -1)
- index = uri.lastIndexOf('\\');
- if (index != -1)
- return uri.substring(index + 1);
- else
- return uri;
- }
-
- private String addTrailingSeparator(String s)
- {
- if (!(s.endsWith("/") || s.endsWith("\\")))
- {
- StringBuffer sb = new StringBuffer(s);
- sb.append('/');
- return sb.toString();
- }
- else
- return s;
- }
-
- private boolean isRelative(String uri)
- {
- return (uri.indexOf(':') == -1);
- }
-
- private void copyXMLSchema(IEnvironment env, String uri, String destURI) throws TransformerException, TransformerConfigurationException, IOException, URIException
- {
- uri = normalize(uri);
- if (!needToCopy(uri)) {
- return;
- }
- destURI = normalize(destURI);
- // load as a cached schema
- XSDSchema xsdSchema = XSDSchemaImpl.getSchemaForSchema(uri);
- // if schema is not cached, parse it
- if (xsdSchema == null)
- {
- XSDParser p = new XSDParser();
- InputStream is = NetUtils.getURLInputStream(uri);
- if (is != null)
- {
- p.parse(is);
- xsdSchema = p.getSchema();
- }
- }
- if (xsdSchema != null)
- {
- // copy schema
- Element e = xsdSchema.getElement();
- DOMSource domSource = new DOMSource(e);
- Transformer serializer = TransformerFactory.newInstance().newTransformer();
- serializer.setOutputProperty(OutputKeys.INDENT, "yes");
- serializer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
- serializer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
- OutputStream os = env.getURIFactory().newURI((new StringBuffer(destURI)).append(getLocalname(uri)).toString()).getOutputStream();
- serializer.transform(domSource, new StreamResult(os));
- os.close();
- // copy <xsd:import>s and <xsd:include>s
- copyXMLSchema(env, xsdSchema, getBaseURI(uri), destURI);
- }
- }
-
- private void copyXMLSchema(IEnvironment env, XSDSchema xsdSchema, String baseURI, String destURI) throws TransformerException, TransformerConfigurationException, IOException, URIException
- {
- if (xsdSchema != null)
- {
- // copy <xsd:import>s and <xsd:include>s
- EList xsdSchemaContents = xsdSchema.getContents();
- for (Iterator it = xsdSchemaContents.iterator(); it.hasNext();)
- {
- Object content = it.next();
- if (content instanceof XSDSchemaDirective)
- {
- XSDSchemaDirective xsdSchemaDirective = (XSDSchemaDirective)content;
- String xsdSchemaDirectiveLocation = xsdSchemaDirective.getSchemaLocation();
- if (xsdSchemaDirectiveLocation != null && isRelative(xsdSchemaDirectiveLocation))
- {
- String directiveURI = (new StringBuffer(baseURI)).append(xsdSchemaDirectiveLocation).toString();
- String directiveBaseURI = getBaseURI(xsdSchemaDirectiveLocation);
- StringBuffer directiveDestURI = new StringBuffer(destURI);
- if (directiveBaseURI != null)
- directiveDestURI.append(directiveBaseURI);
- copyXMLSchema(env, directiveURI, directiveDestURI.toString());
- }
- }
- }
- }
- }
-
- private boolean needToCopy (String normalizedURI) {
- if (ignoreList.contains(normalizedURI))
- return false;
- ignoreList.add(normalizedURI);
- return true;
- }
-
-//normalize the uri to remove relative addressing "/.."
- private String normalize(String uri )
- {
- boolean normalized = false;
- while(!normalized){
- int dir = uri.indexOf("/..");
- if(dir == -1)
- normalized = true;
- else{
- String first = uri.substring(0,dir);
- String second = uri.substring(dir + 3);
- int newIndex = first.lastIndexOf("/");
- if(newIndex == -1){
- normalized = true;
- } else {
- first = first.substring(0,newIndex);
- uri = first + second;
- }
- }
- }
- return uri;
-
- }
-
- public void setWsdlURI(String wsdlURI)
- {
- this.wsdlURI = wsdlURI;
- }
-
- public void setWebServicesParser(WebServicesParser webServicesParser)
- {
- this.webServicesParser = webServicesParser;
- }
-
- public void setDestinationURI(String destinationURI)
- {
- this.destinationURI = destinationURI;
- }
-
- public void setDefinition(Definition def)
- {
- this.def = def;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLTreeCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLTreeCommand.java
deleted file mode 100644
index 0bedb2e..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLTreeCommand.java
+++ /dev/null
@@ -1,115 +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
- * -------- -------- -----------------------------------------------------------
- * 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.consumption.command.common;
-
-import javax.wsdl.Definition;
-
-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.common.ResourceUtils;
-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.util.WSDLCopier;
-
-/**
- * @deprecated Use {@link WSDLCopier} instead.
- */
-public class CopyWSDLTreeCommand extends AbstractDataModelOperation
-{
- private String wsdlURI;
- private WebServicesParser webServicesParser;
- private String destinationURI;
- private Definition def;
- private String wsdlRelPath;
-
- /**
- * Execute the command
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
-
- try
- {
- WSDLCopier copier = new WSDLCopier(webServicesParser);
- copier.setSourceURI(wsdlURI, def);
- copier.setTargetFolderURI(getBaseURI(destinationURI));
- copier.setTargetFilename(getLocalname(destinationURI));
-
- ResourceUtils.getWorkspace().run(copier, monitor);
-
- wsdlRelPath = copier.getRelativePath().toString();
-
- return Status.OK_STATUS;
- }
- catch (CoreException ce)
- {
- IStatus status = ce.getStatus();
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
-
- private String getBaseURI(String uri)
- {
- int index = uri.lastIndexOf('/');
- if (index == -1)
- index = uri.lastIndexOf('\\');
- if (index != -1)
- return uri.substring(0, index + 1);
- else
- return null;
- }
-
- private String getLocalname(String uri)
- {
- int index = uri.lastIndexOf('/');
- if (index == -1)
- index = uri.lastIndexOf('\\');
- if (index != -1)
- return uri.substring(index + 1);
- else
- return uri;
- }
-
- public void setWsdlURI(String wsdlURI)
- {
- this.wsdlURI = wsdlURI;
- }
-
- public void setWebServicesParser(WebServicesParser webServicesParser)
- {
- this.webServicesParser = webServicesParser;
- }
-
- public void setDestinationURI(String destinationURI)
- {
- this.destinationURI = destinationURI;
- }
-
- public void setDefinition(Definition def)
- {
- this.def = def;
- }
-
- public String getWSDLRelPath() {
- return wsdlRelPath;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateFacetedProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateFacetedProjectCommand.java
deleted file mode 100644
index 34279ef..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateFacetedProjectCommand.java
+++ /dev/null
@@ -1,522 +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
- * 20060204 124408 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060217 126757 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060427 126780 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060517 126965 kathy@ca.ibm.com - Kathy Chan
- * 20060905 156230 kathy@ca.ibm.com - Kathy Chan, Handling projects with no target runtime
- * 20070505 184772 kathy@ca.ibm.com - Kathy Chan
- * 20080305 220371 kathy@ca.ibm.com - Kathy Chan
- * 20080305 220371 kathy@ca.ibm.com - Kathy Chan - reverting previous change to 220371
- * 20080326 220371 kathy@ca.ibm.com - Kathy Chan - re-applying 220371
- * 20081001 243869 ericdp@ca.ibm.com - Eric D. Peters, Web Service tools allowing mixed J2EE levels
- * 20091123 242615 mahutch@ca.ibm.com - Mark Hutchinson, Use project creation operations to create projects
- * 20100211 302631 mahutch@ca.ibm.com - Mark Hutchinson, NullPointerException creating utility projects via CreateFacetedProjectCommand
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.commands.ExecutionException;
-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.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.EjbFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetProjectCreationDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.UtilityProjectCreationDataModelProvider;
-import org.eclipse.jst.server.core.FacetUtil;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.common.FacetMatcher;
-import org.eclipse.jst.ws.internal.consumption.common.FacetSetsByTemplateCache;
-import org.eclipse.jst.ws.internal.consumption.common.FacetUtils;
-import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-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.IFacetedProjectTemplate;
-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;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.ServerCore;
-
-public class CreateFacetedProjectCommand extends AbstractDataModelOperation
-{
-
- //name of the project to be created
- private String projectName;
-
- //name of the EAR project associated with projectName
- private String earProjectName;
-
- //id of the IFacetedProjectTemplate to be used to create this project.
- private String templateId;
-
- //required facet versions that must be satisfied when creating the project (this comes from
- //the selected serverRuntime or clientRuntime in the calling scenario)
- private RequiredFacetVersion[] requiredFacetVersions;
-
- //server type id - used to determine the facet runtime the created project will be bound to
- //if serverInstanceId is null or empty
- private String serverFactoryId;
-
- //server id - used to determine the facet runtime the created project will be bound to. May
- //be null or empty.
- private String serverInstanceId;
-
- //facet runtime determined from the serverInstanceId or serverFactoryId
- private org.eclipse.wst.common.project.facet.core.runtime.IRuntime facetRuntime;
-
-
- private boolean containsWebFacet(Set facetVersions) {
- for (Iterator iter = facetVersions.iterator(); iter.hasNext();) {
- IProjectFacetVersion requiredFacetVersion = (IProjectFacetVersion) iter.next();
- if (requiredFacetVersion.getProjectFacet().getId().equals(IModuleConstants.JST_WEB_MODULE)) {
- return true;
- }
- }
- return false;
- }
-
- //return the project creation data model for the templateId or null if no data model found
- private IDataModel getDataModelForTemplate(Set requiredFixedFacets) {
- IDataModel dm = null;
- if (templateId == null)
- return null;
- else if (templateId.equals(IJ2EEModuleConstants.JST_EJB_TEMPLATE)) {
- dm = DataModelFactory.createDataModel(new EjbFacetProjectCreationDataModelProvider());
- dm.setProperty(IJ2EEFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, projectName);
- dm.setBooleanProperty(IJ2EEFacetProjectCreationDataModelProperties.ADD_TO_EAR, false);
- dm.setProperty(IJ2EEFacetProjectCreationDataModelProperties.FACET_RUNTIME, facetRuntime);
- }
- else if (templateId.equals(IJ2EEModuleConstants.JST_APPCLIENT_TEMPLATE)) {
- dm = DataModelFactory.createDataModel(new AppClientFacetProjectCreationDataModelProvider());
- dm.setProperty(IJ2EEFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, projectName);
- dm.setProperty(IJ2EEFacetProjectCreationDataModelProperties.FACET_RUNTIME, facetRuntime);
- }
- else if (templateId.equals(IJ2EEModuleConstants.JST_UTILITY_TEMPLATE)) {
- dm = DataModelFactory.createDataModel(new UtilityProjectCreationDataModelProvider());
- dm.setProperty(IJ2EEFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, projectName);
- dm.setProperty(IJ2EEFacetProjectCreationDataModelProperties.FACET_RUNTIME, facetRuntime);
- }
- else if (templateId.equals(IJ2EEModuleConstants.JST_WEB_TEMPLATE) || containsWebFacet(requiredFixedFacets)) {
- //we want any project with the web template ID, or that contains a jst.web facet to be created with this data model
- dm = DataModelFactory.createDataModel(new WebFacetProjectCreationDataModelProvider());
- dm.setProperty(IJ2EEFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, projectName);
- dm.setBooleanProperty(IJ2EEFacetProjectCreationDataModelProperties.ADD_TO_EAR, false);
- dm.setProperty(IJ2EEFacetProjectCreationDataModelProperties.FACET_RUNTIME, facetRuntime);
- }
- return dm;
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info)
- {
- IStatus status = Status.OK_STATUS;
-
- // check if data ready
- status = checkDataReady();
- if (status.getSeverity()==Status.ERROR)
- {
- return status;
- }
-
- IProject project = ProjectUtilities.getProject(projectName);
- if (!project.exists())
- {
- try{
- IProject createdProject;
- IFacetedProject fproject;
- Set facetsToAdd = getFacetsToAdd();
-
- IDataModel dm = getDataModelForTemplate(facetsToAdd);
- if (dm != null) {
- //we found a project creation data model for this template id. use it to create the project
-
- Set missingFacets = new HashSet();
-
- //here we look at the facet versions in facetsToAdd and set the version on the data model to match
- //if no facet data model is found we add it to the missingFacets collection to add later
- if (dm.isProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP)) {
- for (Iterator iter = facetsToAdd.iterator(); iter.hasNext();) {
- IProjectFacetVersion requiredFacetVersion = (IProjectFacetVersion) iter.next();
- final FacetDataModelMap map = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- IDataModel facetDM = map.getFacetDataModel(requiredFacetVersion.getProjectFacet().getId());
- if (facetDM != null) {
- facetDM.setStringProperty(IFacetDataModelProperties.FACET_VERSION_STR, requiredFacetVersion.getVersionString());
- } else {
- missingFacets.add(requiredFacetVersion);
- }
- }
- }
-
- dm.getDefaultOperation().execute(null, null);
- createdProject = ProjectUtilities.getProject(projectName);
- fproject = ProjectFacetsManager.create(createdProject);
-
- //add any facets that were not added by the project creation data model
- if (missingFacets.size() > 0) {
- status = FacetUtils.addFacetsToProject(fproject, missingFacets);
- if (status.getSeverity() == IStatus.ERROR) {
- return status;
- }
- }
- }
- else {
- //did not find a project creation data model. create the project and install facets manually
- status = FacetUtils.createNewFacetedProject(projectName);
- if (status.getSeverity() == IStatus.ERROR) {
- return status;
- }
-
- createdProject = ProjectUtilities.getProject(projectName);
- fproject = ProjectFacetsManager.create(createdProject);
-
- //Install the facet versions
- status = FacetUtils.addFacetsToProject(fproject, facetsToAdd);
- if (status.getSeverity() == IStatus.ERROR) {
- return status;
- }
- //Set the installed facet versions as fixed.
- Set newFacetVersions = fproject.getProjectFacets();
- Set fixedFacets = new HashSet();
- for (Iterator iter = newFacetVersions.iterator(); iter.hasNext();) {
- IProjectFacetVersion facetVersion = (IProjectFacetVersion) iter.next();
- fixedFacets.add(facetVersion.getProjectFacet());
- }
- status = FacetUtils.setFixedFacetsOnProject(fproject, fixedFacets);
- if (status.getSeverity() == IStatus.ERROR) {
- return status;
- }
- }
-
- //Set the runtime
- if (facetRuntime != null) {
- status = FacetUtils.setFacetRuntimeOnProject(fproject, facetRuntime);
- }
-
- // add facets required by Web service runtime
- if (requiredFacetVersions.length != 0) {
- status = FacetUtils.addRequiredFacetsToProject(project, requiredFacetVersions, monitor);
- if (status.getSeverity() == Status.ERROR) {
- return status;
- }
- }
-
- if (facetRuntime != null) {
- // add the default facets that's not in conflict with the existing facets
- Set projectFacetVersionSet = fproject.getProjectFacets();
- Set projectFacetSet = new HashSet();
- // get the project facet from the project facet version we calculated
- for (Iterator iter = projectFacetVersionSet.iterator(); iter.hasNext();) {
- IProjectFacetVersion pfv = (IProjectFacetVersion) iter.next();
- projectFacetSet.add(pfv.getProjectFacet());
- }
- try {
- Set defaultProjectFacetVersionSet = facetRuntime.getDefaultFacets(projectFacetSet);
- // The returned defaultFacetSet contains the original projectFacetSet passed into getDefaultFacets
- // plus any default facets that are not in conflict with the original projectFacetSet.
- // Add to facetsToAdd if the the default facet is not in the original set.
- Set defaultFacetsToAdd = new HashSet();
- for (Iterator iter = defaultProjectFacetVersionSet.iterator(); iter.hasNext();) {
- IProjectFacetVersion defaultProjFacetVersion = (IProjectFacetVersion) iter.next();
- if( ! projectFacetSet.contains( defaultProjFacetVersion.getProjectFacet() ) )
- {
- defaultFacetsToAdd.add(defaultProjFacetVersion);
- }
- }
- if (!defaultFacetsToAdd.isEmpty()) {
- status = FacetUtils.addFacetsToProject(fproject, defaultFacetsToAdd);
- if (status.getSeverity() == IStatus.ERROR) {
- return status;
- }
- }
- } catch (CoreException e) {
- // If there's any exception when trying to get the default facet, just ignore the default facet
- // and return the original facetsToAdd.
- }
- }
- }
- catch (CoreException ce) {
- return StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_PROJECT_CREATION, new String[] { projectName }));
- }
- catch (ExecutionException e) {
- return StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_PROJECT_CREATION, new String[] { projectName }));
- }
-
- }
-
- return status;
- }
-
- private IStatus checkDataReady()
- {
-
- if (projectName == null)
- {
- return StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_PROJECT_CREATION, new String[] {projectName}));
- }
-
- return Status.OK_STATUS;
- }
-
- /**
- * Returns the set of facets to install on the new project. The set will consist
- * of the highest version of each of the template's fixed facets that satisfies
- * the required facet versions, the facet runtime, and the EAR project J2EE level.
- * @return Set a Set containing elements of type IProjectFacetVersion.
- */
- private Set getFacetsToAdd()
- {
- Set facets = null;
-
- //Set the facet runtime.
- setFacetRuntime();
- //Get all facet version combinations for the template in order of ascending version numbers.
- Set[] allCombinations = FacetSetsByTemplateCache.getInstance().getFacetVersionCombinationsFromTemplate(templateId);
- int n = allCombinations.length;
- if (facetRuntime != null)
- {
- //Walk the facet version combinations in order of descending version numbers.
- for (int i=n-1; i>=0; i--)
- {
- //Check this template combination to see if it is compatible with the
- //required facet versions, the server runtime, and the EAR. If it is, choose it.
- Set combination = allCombinations[i];
- FacetMatcher fm = FacetUtils.match(requiredFacetVersions, combination);
- if (fm.isMatch())
- {
- //Check against Runtime & EAR
- if (FacetUtils.doesRuntimeSupportFacets(facetRuntime, combination) && doesEARSupportFacets(combination) )
- {
- //We have a match. Use this combination of facet versions for project creation.
- facets = combination;
- break;
- }
- }
- }
-
- }
- else
- {
- for (int i=n-1; i>=0; i--)
- {
- //Check this template combination to see if it is compatible with both the
- //service/client runtime and the server runtime. If it is, choose it.
- Set combination = allCombinations[i];
- FacetMatcher fm = FacetUtils.match(requiredFacetVersions, combination);
- if (fm.isMatch())
- {
- //We have a match. Use this combination of facet versions for project creation.
- facets = combination;
- break;
- }
- }
- }
-
- //Unlikely to get to this point in the code, but if we do, choose the highest version
- //of each fixed facet in the template that is supported by the server runtime
- if (facets == null)
- {
- facets = getHighestFacetVersionsFromTemplateAndServer();
- }
-
- return facets;
- }
-
- /**
- * Sets the facetRuntime attribute based on the serverInstanceId or serverFactoryId
- * Preference is given to non-stub facet runtimes.
- */
- private void setFacetRuntime()
- {
-
- if (serverInstanceId != null && serverInstanceId.length()>0)
- {
- IServer server = ServerCore.findServer(serverInstanceId);
- IRuntime sRuntime = server.getRuntime();
- facetRuntime = FacetUtil.getRuntime(sRuntime);
- }
- else
- {
- if (serverFactoryId != null && serverFactoryId.length() > 0)
- {
- //Find a non Stub runtime that matches this server type
- IRuntime serverRuntime = ServerUtils.getNonStubRuntime(serverFactoryId);
- if (serverRuntime != null)
- {
- facetRuntime = FacetUtil.getRuntime(serverRuntime);
- }
- else
- {
- //Accept stub runtime.
- IServerType st = ServerCore.findServerType(serverFactoryId);
- String runtimeTypeId = st.getRuntimeType().getId();
- //Find the facet runtime
- IRuntime[] runtimes = ServerCore.getRuntimes();
- for (int i=0; i<runtimes.length; i++)
- {
- IRuntime sRuntime = runtimes[i];
- if (sRuntime.getRuntimeType().getId().equals(runtimeTypeId))
- {
- facetRuntime = FacetUtil.getRuntime(sRuntime);
- }
- }
- }
- }
- }
- }
-
- public void setProjectName(String projectName)
- {
- this.projectName = projectName;
- }
-
- public void setTemplateId(String templateId)
- {
- this.templateId = templateId;
- }
-
- public void setRequiredFacetVersions(RequiredFacetVersion[] requiredFacetVersions)
- {
- this.requiredFacetVersions = requiredFacetVersions;
- }
-
- public void setServerFactoryId(String serverFactoryId)
- {
- this.serverFactoryId = serverFactoryId;
- }
-
- public void setServerInstanceId(String serverInstanceId)
- {
- this.serverInstanceId = serverInstanceId;
- }
- public void setEarProjectName(String earProject) {
- this.earProjectName = earProject;
- }
-
- private RequiredFacetVersion[] getRequiredWebFacets() {
- return new RequiredFacetVersion[] { getRequiredFacetVersion(
- IModuleConstants.JST_WEB_MODULE,
- J2EEUtils.getWebJ2EEVersionFromEARJ2EEVersion(ProjectUtilities.getProject(earProjectName))) };
- }
-
- private RequiredFacetVersion[] getRequiredAppClientFacets() {
- return new RequiredFacetVersion[] { getRequiredFacetVersion(
- IModuleConstants.JST_APPCLIENT_MODULE,
- J2EEUtils.getAppClientJ2EEVersionFromEARJ2EEVersion(ProjectUtilities.getProject(earProjectName))) };
- }
-
- private RequiredFacetVersion[] getRequiredEJBFacets() {
- return new RequiredFacetVersion[] { getRequiredFacetVersion(
- IModuleConstants.JST_EJB_MODULE,
- J2EEUtils.getEJBJ2EEVersionFromEARJ2EEVersion(ProjectUtilities.getProject(earProjectName))) };
- }
-
- private boolean doesEARSupportFacets(Set combination) {
- try {
-
- if (earProjectName == null || earProjectName.length() == 0
- || !ProjectUtilities.getProject(earProjectName).exists())
- // the ear does not exist or the project type template is
- // undefined
- return true;
- else {
- if (combinationContainsFacet(combination, IModuleConstants.JST_WEB_MODULE))
- return FacetUtils
- .match(getRequiredWebFacets(), combination)
- .isMatch();
- else if (combinationContainsFacet(combination, IModuleConstants.JST_EJB_MODULE))
- return FacetUtils
- .match(getRequiredEJBFacets(), combination)
- .isMatch();
- else if (combinationContainsFacet(combination, IModuleConstants.JST_APPCLIENT_MODULE))
- return FacetUtils.match(getRequiredAppClientFacets(),
- combination).isMatch();
- else
- return true;
- }
- } catch (Exception e) {
- return true;
- }
- }
-
- private boolean combinationContainsFacet(Set combination, String facetName) {
- if (combination == null || facetName == null || facetName.length() == 0)
- return false;
- for (Iterator iter = combination.iterator(); iter.hasNext();) {
- IProjectFacetVersion nextFacetVersion = (IProjectFacetVersion) iter.next();
- if (facetName.equals(nextFacetVersion.getProjectFacet().getId()))
- return true;
- }
- return false;
- }
-
- private RequiredFacetVersion getRequiredFacetVersion(String facetName,
- String facetVersion) {
- IProjectFacet projectFacet = ProjectFacetsManager
- .getProjectFacet(facetName);
- IProjectFacetVersion projFacetVersion = projectFacet
- .getVersion(facetVersion);
- RequiredFacetVersion reqFacetVersion = new RequiredFacetVersion();
- reqFacetVersion.setAllowNewer(false);
- reqFacetVersion.setProjectFacetVersion(projFacetVersion);
- return reqFacetVersion;
- }
-
- private Set getHighestFacetVersionsFromTemplateAndServer()
- {
- IFacetedProjectTemplate template = ProjectFacetsManager.getTemplate(templateId);
- Set fixedFacets = template.getFixedProjectFacets();
- HashSet initial = new HashSet();
- for (Iterator itr = fixedFacets.iterator(); itr.hasNext(); )
- {
- IProjectFacet facet = (IProjectFacet) itr.next();
- IProjectFacetVersion highestFacetVersion = null;
- try {
- highestFacetVersion = facet.getLatestSupportedVersion(facetRuntime);
- } catch (CoreException e) {
- try {
- highestFacetVersion = facet.getLatestVersion();
- } catch (CoreException e2) {
- //not much we can do here
- }
-
- }
- initial.add(highestFacetVersion);
- }
-
- return initial;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateJavaProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateJavaProjectCommand.java
deleted file mode 100644
index dc90342..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateJavaProjectCommand.java
+++ /dev/null
@@ -1,82 +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.consumption.command.common;
-
-import org.eclipse.core.resources.ICommand;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-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.Path;
-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.launching.JavaRuntime;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-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 CreateJavaProjectCommand extends AbstractDataModelOperation
-{
- private String projectName_;
-
- /**
- * Default CTOR
- */
- public CreateJavaProjectCommand()
- {
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName_);
-
- if (project != null && !project.exists())
- {
- try
- {
- project.create(ResourcesPlugin.getWorkspace().newProjectDescription(project.getName()), monitor);
- project.open(monitor);
- IProjectDescription desc = project.getDescription();
- desc.setNatureIds(new String[] {JavaCore.NATURE_ID});
- ICommand cmd = desc.newCommand();
- cmd.setBuilderName(JavaCore.BUILDER_ID);
- desc.setBuildSpec(new ICommand[] {cmd});
- project.setDescription(desc, monitor);
- IJavaProject javaProject = JavaCore.create(project);
- Path projectRoot = new Path(Path.ROOT.append(new Path(project.getName())).toString());
- javaProject.setRawClasspath(new IClasspathEntry[] {JavaCore.newSourceEntry(projectRoot), JavaCore.newContainerEntry(new Path(JavaRuntime.JRE_CONTAINER))}, monitor);
- javaProject.setOutputLocation(projectRoot, monitor);
- }
- catch (CoreException ce)
- {
- IStatus status = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_CANNOT_CREATE_JAVA_PROJECT, new String[] {projectName_}), ce);
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
- return Status.OK_STATUS;
- }
-
- public void setProjectName(String projectName)
- {
- projectName_ = projectName;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateMonitorCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateMonitorCommand.java
deleted file mode 100644
index 84b886c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateMonitorCommand.java
+++ /dev/null
@@ -1,137 +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.consumption.command.common;
-
-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.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-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.server.core.ServerPort;
-import org.eclipse.wst.server.core.internal.IMonitoredServerPort;
-import org.eclipse.wst.server.core.internal.IServerMonitorManager;
-import org.eclipse.wst.server.core.internal.ServerMonitorManager;
-
-public class CreateMonitorCommand extends AbstractDataModelOperation
-{
-
- private static final String WEB_SERVICES = "Web services";
-
- private Boolean monitorService;
-
- private String serviceServerInstanceId;
-
- private Integer monitoredPort;
-
- public CreateMonitorCommand() {
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
-
- if (monitorService != null && monitorService.booleanValue()) {
- IServer server = ServerCore.findServer(serviceServerInstanceId);
- if (server != null) {
-
- // IMonitorableServer monitorableServer = (IMonitorableServer)
- // serverDelegate;
- ServerPort[] ports = server.getServerPorts(null);
- ServerPort port = null;
- for (int it = 0; it < ports.length; it++) {
- ServerPort p = ports[it];
- String protocol = p.getProtocol();
- if (protocol != null && protocol.trim().toLowerCase().equals("http")) {
- port = p;
- break;
- }
- }
- if (port != null) {
- IServerMonitorManager serverMonitorManager = ServerMonitorManager.getInstance();
- IMonitoredServerPort[] monitoredPorts = serverMonitorManager.getMonitoredPorts(server);
- for (int it2 = 0; it2 < monitoredPorts.length; it2++) {
- IMonitoredServerPort imsPort = monitoredPorts[it2];
- if (port.getPort() == imsPort.getServerPort().getPort() && hasContentWebServices(imsPort)) // port
- // already
- // being
- // monitored
- {
- if (!imsPort.isStarted()) {
- try {
- serverMonitorManager.startMonitor(imsPort);
- }
- catch (CoreException ce) {
- IStatus error = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_UNABLE_TO_START_MONITOR,
- new Object[] { String.valueOf(port.getPort()), server.getName()}), ce);
- env.getStatusHandler().reportError(error);
- return error;
- }
- }
- monitoredPort = new Integer(imsPort.getMonitorPort());
- return Status.OK_STATUS;
- }
- }
- try {
- IMonitoredServerPort imsPort = serverMonitorManager.createMonitor(server, port, -1, new String[] { WEB_SERVICES});
- serverMonitorManager.startMonitor(imsPort);
- monitoredPort = new Integer(imsPort.getMonitorPort());
- return Status.OK_STATUS;
- }
- catch (CoreException ce) {
- IStatus error = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_UNABLE_TO_START_MONITOR, new Object[] {
- String.valueOf(port.getPort()), server.getName()}), ce);
- env.getStatusHandler().reportError(error);
- return error;
- }
- }
-
- else {
- IStatus info = StatusUtils.infoStatus( NLS.bind(ConsumptionMessages.MSG_INFO_MONITORING_NOT_SUPPORTED,
- new Object[] { server.getName()}) );
- env.getStatusHandler().reportInfo(info);
- return info;
- }
- }
- }
- return Status.OK_STATUS;
- }
-
- private boolean hasContentWebServices(IMonitoredServerPort imsPort) {
- String[] contents = imsPort.getContentTypes();
- for (int i = 0; i < contents.length; i++)
- if (WEB_SERVICES.equals(contents[i])) return true;
- return false;
- }
-
- public void setServiceTypeRuntimeServer(TypeRuntimeServer typeRuntimeServer) {
- this.serviceServerInstanceId = typeRuntimeServer.getServerInstanceId();
- }
-
- public void setServiceServerInstanceId(String serviceServerInstanceId) {
- this.serviceServerInstanceId = serviceServerInstanceId;
- }
-
- public Integer getMonitoredPort() {
- return monitoredPort;
- }
-
- public void setMonitorService(Boolean value) {
- monitorService = value;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateServerCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateServerCommand.java
deleted file mode 100644
index d05873c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateServerCommand.java
+++ /dev/null
@@ -1,142 +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
- * -------- -------- -----------------------------------------------------------
- * 20071130 203826 kathy@ca.ibm.com - Kathy Chan
- * 20071210 203826 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-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.consumption.ConsumptionMessages;
-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.IRuntime;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerUtil;
-
-public class CreateServerCommand extends AbstractDataModelOperation
-{
- private String serverFactoryId;
- private String serverRuntimeId;
- private String serverInstanceId;
-
- /**
- * Creates a server of the factory id using the server runtime Id if provided
- * Note1: Checking for server instance == null is done in the PreService/ClientInstallCommands
- * Note2: Reporting of errors is done in PreService/ClientInstallCommands; simply return the status.
- */
- public CreateServerCommand(){
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
-
- IStatus status = Status.OK_STATUS;
-
- if (serverFactoryId==null){
- status = StatusUtils.errorStatus(ConsumptionMessages.MSG_ERROR_CREATE_SERVER );
- return status;
- }
-
- IServerWorkingCopy serverWC = null;
- IServer server = null;
- try {
- IServerType serverType = ServerCore.findServerType(serverFactoryId);
- if (serverType!=null) {
-
- IRuntime serverRuntime = null;
- if (serverRuntimeId != null) {
- serverRuntime = ServerCore.findRuntime(serverRuntimeId); // may return null if no runtime is found
- }
-
- if (serverRuntime == null) { // either serverRuntimeId is null or did not find a runtime with that Id
- //Choose a Runtime which is not a stub
- IRuntime nonStubRuntime = null;
- IRuntime[] runtimes = ServerUtil.getRuntimes(null, null);
- String serverRuntimeTypeId = serverType.getRuntimeType().getId();
- for (int i = 0; i < runtimes.length; i++) {
- IRuntime runtime = runtimes[i];
- String thisRuntimeTypeId = runtime.getRuntimeType().getId();
- if (thisRuntimeTypeId.equals(serverRuntimeTypeId) && !runtime.isStub()) {
- //Found an appropriate IRuntime that is not a stub
- nonStubRuntime = runtime;
- break;
- }
- }
-
- if (nonStubRuntime==null)
- {
- status = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_STUB_ONLY,new String[]{serverFactoryId}) );
- return status;
- }
-
- serverRuntime = nonStubRuntime;
- }
-
- if (env!=null)
- {
- serverWC = serverType.createServer(null, null, serverRuntime, monitor );
- }
- else
- {
- serverWC = serverType.createServer(null, null, serverRuntime, null);
- }
-
- if (serverWC != null) {
- if (env!=null)
- server = serverWC.saveAll(true, monitor );
- else
- server = serverWC.saveAll(true, null);
- }
- }
- } catch (CoreException ce) {
- status = StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_CREATE_SERVER, ce);
- return status;
- }
-
- // set serverInstanceId
- if (server!=null)
- serverInstanceId = server.getId();
- else {
- status = StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_CREATE_SERVER );
- }
-
- return status;
- }
-
- public void setServerFactoryid(String serverFactoryId)
- {
- this.serverFactoryId = serverFactoryId;
- }
-
- public void setServerRuntimeId(String serverRuntimeId)
- {
- this.serverRuntimeId = serverRuntimeId;
- }
-
- public String getServerInstanceId()
- {
- return serverInstanceId;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableBuildCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableBuildCommand.java
deleted file mode 100644
index 012ccbf..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableBuildCommand.java
+++ /dev/null
@@ -1,68 +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.consumption.command.common;
-
-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.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager;
-import org.eclipse.wst.command.internal.env.core.common.ProgressUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-
-public class DisableBuildCommand extends AbstractDataModelOperation
-{
-
- private ValidationManager manager_;
- /**
- * CTOR;
- */
- public DisableBuildCommand()
- {
-
- }
-
- /**
- * Execute the command
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IStatus status = Status.OK_STATUS;
-
- ProgressUtils.report( monitor, ConsumptionMessages.TASK_DESC_WEBSERVICE_DISABLE_BUILD);
-
- if (manager_!=null) {
- manager_.disableAutoBuild();
- }
- return status;
- }
-
- /**
- * Set the model
- *
- * @param model
- */
- public void setModel(Model model) {
- }
-
-
- /**
- * @param manager_ The manager_ to set.
- */
- public void setValidationManager(ValidationManager manager) {
- this.manager_ = manager;
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableValidationCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableValidationCommand.java
deleted file mode 100644
index 845dfcf..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableValidationCommand.java
+++ /dev/null
@@ -1,63 +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.consumption.command.common;
-
-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.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager;
-import org.eclipse.wst.command.internal.env.core.common.ProgressUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class DisableValidationCommand extends AbstractDataModelOperation
-{
-
- private ValidationManager manager_;
- private IProject serviceProject_;
-
- /**
- * CTOR;
- */
- public DisableValidationCommand() {
- }
-
- /**
- * Execute the command
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IStatus status = Status.OK_STATUS;
-
- ProgressUtils.report(monitor, ConsumptionMessages.TASK_DESC_WEBSERVICE_DISABLE_VALIDATION);
-
- IProject project = serviceProject_;
- if (project != null) manager_.disableValidationForProject(project);
-
- return status;
- }
-
- /**
- * @param manager_
- * The manager_ to set.
- */
- public void setValidationManager(ValidationManager manager) {
- this.manager_ = manager;
- }
-
- public void setServiceProject(IProject serviceProject){
- this.serviceProject_ = serviceProject;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/JavaMofReflectionCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/JavaMofReflectionCommand.java
deleted file mode 100644
index f5e2931..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/JavaMofReflectionCommand.java
+++ /dev/null
@@ -1,114 +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.consumption.command.common;
-
-
-//core stuff
-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.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jem.util.emf.workbench.nature.EMFNature;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-/**
-* This class is to be used to Build the data model
-* first we get the java class and then build the model
-*/
-public class JavaMofReflectionCommand extends AbstractDataModelOperation
-{
-
- public static String LABEL = "JavaMofReflectionCommand";
- public static String DESCRIPTION = "reflection for a given class";
- public static String OK_MESSAGE = "The model has been built ";
- private static String JAVA_EXTENSION = ".java";
- private static String CLASS_EXTENSION = ".class";
-
- private String clientProject;
- private JavaHelpers javaClass;
- private String qname;
- private String proxyBean;
-
- /**
- * Constructs a new JavaMofReflectionCommand with the given label and description
- *
- */
- public JavaMofReflectionCommand()
- {
- }
-
- // setters for this command
-
-
- /**
- * The end result of this whole process is to get the Java Class
- */
- public JavaHelpers getJavaClass()
- {
- return javaClass;
- }
-
-
- private void processQName()
- {
- qname = proxyBean;
- if (qname.toLowerCase().endsWith(JAVA_EXTENSION)) {
- qname = qname.substring(0,(qname.length() -5));
- }
- if (qname.toLowerCase().endsWith(CLASS_EXTENSION)) {
- qname = qname.substring(0,(qname.length() -6));
- }
- }
-
- /**
- * Get the java model from the resource then
- * build the model from the mof
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- //just make sure the project and qname are there
- //they are essential for this operation
- IStatus status = Status.OK_STATUS;
- IProject clientIProject = (IProject)ResourceUtils.findResource(clientProject);
- processQName();
- if(clientProject == null || qname == null)
- return StatusUtils.warningStatus( ConsumptionMessages.MSG_WARN_UNABLE_TO_FIND_PROXY );
-
- try {
- EMFNature nature = JemProjectUtilities.getJEM_EMF_Nature(clientIProject, true);
- javaClass = JavaRefFactory.eINSTANCE.reflectType(qname, nature.getResourceSet());
- } catch (CoreException e) {
- }
-
- return status;
- }
-
- public void setProxyBean(String proxyBean)
- {
- this.proxyBean = proxyBean;
- }
-
- public void setClientProject(String clientProject)
- {
- this.clientProject = clientProject;
- }
-
- }
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ManageServerStartUpCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ManageServerStartUpCommand.java
deleted file mode 100644
index 94ece1e..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ManageServerStartUpCommand.java
+++ /dev/null
@@ -1,139 +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.consumption.command.common;
-
-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.consumption.ConsumptionMessages;
-import org.eclipse.wst.command.internal.env.core.common.ProgressUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-
-public class ManageServerStartUpCommand extends AbstractDataModelOperation
-{
-
- private Boolean isStartServiceEnabled_;
- private Boolean isTestServiceEnabled_;
-
- private IProject serviceProject_;
- private String serviceServerTypeId_;
- private IServer serviceExistingServer_;
-
- private IProject sampleProject_;
- private String sampleServerTypeId_;
- private IServer sampleExistingServer_;
-
- private boolean isWebProjectStartupRequested_;
-
- /**
- * Default CTOR;
- */
- public ManageServerStartUpCommand( ) {
-
- }
-
- /**
- * Execute the command
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
- IStatus status = Status.OK_STATUS;
- ProgressUtils.report(monitor, ConsumptionMessages.PROGRESS_INFO_START_WEB_PROJECT);
-
- if (isStartServiceEnabled_.booleanValue() && serviceExistingServer_!=null){
- //System.out.println("Calling service server start: "+serviceProject_+" "+serviceServerTypeId_);
- StartProjectCommand spc = new StartProjectCommand( );
- spc.setServiceProject(serviceProject_);
- spc.setServiceServerTypeID(serviceServerTypeId_);
- spc.setServiceExistingServer(serviceExistingServer_);
- spc.setIsWebProjectStartupRequested(isWebProjectStartupRequested_);
- spc.setEnvironment( env );
- spc.execute( null, null );
- }
-
- if(isTestServiceEnabled_.booleanValue()&& sampleExistingServer_!=null && serviceExistingServer_!=null && !sampleExistingServer_.equals(serviceExistingServer_)){
- //System.out.println("Calling client server start: "+sampleProject_+" "+sampleExistingServer__);
- StartProjectCommand spc = new StartProjectCommand( );
- spc.setSampleProject(sampleProject_);
- spc.setSampleServerTypeID(sampleServerTypeId_);
- spc.setSampleExistingServer(sampleExistingServer_);
- spc.setCreationScenario(new Boolean("false"));
- spc.setEnvironment( env );
- spc.execute( null, null );
- }
-
- return status;
- }
-
- /**
- * @param isStartServiceEnabled The isStartServiceEnabled to set.
- */
- public void setStartService(Boolean isStartServiceEnabled) {
- this.isStartServiceEnabled_ = isStartServiceEnabled;
- }
- /**
- * @param isTestServiceEnabled The isTestServiceEnabled to set.
- */
- public void setTestService(Boolean isTestServiceEnabled) {
- this.isTestServiceEnabled_ = isTestServiceEnabled;
- }
- /**
- * @param serviceExistingServer The serviceExistingServer to set.
- */
- public void setServiceExistingServer(IServer serviceExistingServer) {
- this.serviceExistingServer_ = serviceExistingServer;
- }
-
- /**
- * @param serviceServerTypeId The serviceServerTypeId to set.
- */
- public void setServiceServerTypeId(String serviceServerTypeId) {
- this.serviceServerTypeId_ = serviceServerTypeId;
- }
- /**
- * @param serviceProject The serviceProject to set.
- */
- public void setServiceProject(IProject serviceProject) {
- this.serviceProject_ = serviceProject;
- }
-
- /**
- * @param sampleExistingServer The sampleExistingServer to set.
- */
- public void setSampleExistingServer(IServer sampleExistingServer) {
- this.sampleExistingServer_ = sampleExistingServer;
- }
- /**
- * @param sampleProject The sampleProject to set.
- */
- public void setSampleProject(IProject sampleProject) {
- this.sampleProject_ = sampleProject;
- }
- /**
- * @param sampleServerTypeId The sampleServerTypeId to set.
- */
- public void setSampleServerTypeId(String sampleServerTypeId) {
- this.sampleServerTypeId_ = sampleServerTypeId;
- }
-
- /**
- * @param isRestartProjectNeeded The isRestartProjectNeeded to set.
- */
- public void setIsWebProjectStartupRequested(boolean isRestartProjectNeeded) {
- this.isWebProjectStartupRequested_ = isRestartProjectNeeded;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreBuildStateCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreBuildStateCommand.java
deleted file mode 100644
index ba15238..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreBuildStateCommand.java
+++ /dev/null
@@ -1,56 +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.consumption.command.common;
-
-
-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.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager;
-import org.eclipse.wst.command.internal.env.core.common.ProgressUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class RestoreBuildStateCommand extends AbstractDataModelOperation
-{
-
- private ValidationManager manager_;
-
- /**
- * Default CTOR;
- */
- public RestoreBuildStateCommand()
- {
- }
-
- /**
- * Execute the command
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- ProgressUtils.report( monitor, ConsumptionMessages.TASK_DESC_WEBSERVICE_RESTORE_BUILD);
-
- manager_.restoreAutoBuild();
-
- return Status.OK_STATUS;
- }
-
- /**
- * @param manager_ The manager_ to set.
- */
- public void setValidationManager(ValidationManager manager) {
- this.manager_ = manager;
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreValidationStateCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreValidationStateCommand.java
deleted file mode 100644
index f7e97f5..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreValidationStateCommand.java
+++ /dev/null
@@ -1,58 +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.consumption.command.common;
-
-
-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.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager;
-import org.eclipse.wst.command.internal.env.core.common.ProgressUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class RestoreValidationStateCommand extends AbstractDataModelOperation
-{
- private ValidationManager manager_;
-
- private boolean runValidation_;
-
- /**
- * Default CTOR;
- */
- public RestoreValidationStateCommand( boolean runValidation )
- {
- runValidation_ = runValidation;
- }
-
- /**
- * Execute the command
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- ProgressUtils.report( monitor, ConsumptionMessages.TASK_DESC_WEBSERVICE_RESTORE_VALIDATION);
-
- manager_.restoreValidationForProjects( runValidation_ );
-
- return Status.OK_STATUS;
- }
-
- /**
- * @param manager The validation manager to set.
- */
- public void setValidationManager(ValidationManager manager) {
- this.manager_ = manager;
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ServerPublishOperationListener.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ServerPublishOperationListener.java
deleted file mode 100644
index f20448e..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ServerPublishOperationListener.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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.consumption.command.common;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.server.core.IServer.IOperationListener;
-
-public class ServerPublishOperationListener implements IOperationListener {
-
- private volatile IStatus publishStatus;
-
- public ServerPublishOperationListener()
- {
- publishStatus = null;
- }
-
- public void done(IStatus result) {
- publishStatus = result;
- }
-
- public IStatus getPublishStatus()
- {
- while (publishStatus == null)
- {
- try
- {
- Thread.sleep(300);
- }
- catch (InterruptedException e)
- {
- }
- }
- return publishStatus;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartProjectCommand.java
deleted file mode 100644
index 774a0f2..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartProjectCommand.java
+++ /dev/null
@@ -1,156 +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.consumption.command.common;
-
-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.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.common.WebServiceStartServerRegistry;
-import org.eclipse.wst.command.internal.env.core.common.ProgressUtils;
-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;
-
-public class StartProjectCommand extends AbstractDataModelOperation
-{
-
-private Boolean creationScenario_ = Boolean.TRUE;
-
-private boolean isWebProjectStartupRequested_;
-private IProject serviceProject_;
-private IProject sampleProject_;
-private String serviceServerTypeID_;
-private String sampleServerTypeID_;
-private IServer serviceExistingServer_;
-private IServer sampleExistingServer_;
-
-
-/**
- * Default CTOR;
- */
-public StartProjectCommand( ) {
-
-}
-
-/**
- * Default CTOR;
- */
-public StartProjectCommand(boolean creationScenario ) {
- creationScenario_ = new Boolean(creationScenario);
-}
-
-/**
- * Execute the command
- */
-public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-{
- IEnvironment env = getEnvironment();
-
- IStatus status = Status.OK_STATUS;
- ProgressUtils.report( monitor, ConsumptionMessages.PROGRESS_INFO_START_WEB_PROJECT);
-
-
- IProject project = ((creationScenario_.booleanValue()) ? serviceProject_ : sampleProject_);
- String serverTypeID = ((creationScenario_.booleanValue()) ? serviceServerTypeID_ : sampleServerTypeID_);
- IServer server = ((creationScenario_.booleanValue()) ? serviceExistingServer_ : sampleExistingServer_);
- if (serverTypeID == null && server!=null) {
- serverTypeID = server.getServerType().getId();
- }
- if (project == null)
- {
- status = StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_PROJECT_NOT_FOUND );
- env.getStatusHandler().reportError(status);
- return status;
- }
- IServer instance = ServerUtils.getServerForModule(ServerUtils.getModule(project), serverTypeID, server, true, monitor );
- if (instance == null)
- {
- status = StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_INSTANCE_NOT_FOUND );
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- try
- {
- AbstractStartServer startServerCommand = null;
- WebServiceStartServerRegistry reg = WebServiceStartServerRegistry.getInstance();
- startServerCommand = (AbstractStartServer)reg.getServerStartByTypeId(instance.getServerType().getId());
- startServerCommand.StartServer(project, instance, monitor, isWebProjectStartupRequested_);
- return status;
- }
- catch (CoreException ce )
- {
- IStatus embeddedStatus = ce.getStatus();
- status = embeddedStatus;
- env.getStatusHandler().reportError(status);
- return status;
- }
- catch (Exception e)
- {
- status = StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_SERVER, e);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
-}
-
-public void setCreationScenario(Boolean creationScenario)
-{
- creationScenario_ = creationScenario;
-}
-
-public void setServiceProject(IProject serviceProject)
-{
- serviceProject_ = serviceProject;
-}
-
-public void setSampleProject(IProject sampleProject)
-{
- sampleProject_ = sampleProject;
-}
-
-public void setServiceServerTypeID(String serviceServerTypeID)
-{
- serviceServerTypeID_ = serviceServerTypeID;
-}
-
-public void setSampleServerTypeID(String sampleServerTypeID)
-{
- sampleServerTypeID_ = sampleServerTypeID;
-}
-
-public void setServiceExistingServer(IServer serviceExistingServer)
-{
- serviceExistingServer_ = serviceExistingServer;
- if (serviceExistingServer_ != null)
- setServiceServerTypeID(serviceExistingServer_.getServerType().getId());
-}
-
-public void setSampleExistingServer(IServer sampleExistingServer)
-{
- sampleExistingServer_ = sampleExistingServer;
- if (sampleExistingServer_ != null)
- setSampleServerTypeID(sampleExistingServer_.getServerType().getId());
-}
-
-public void setIsWebProjectStartupRequested(boolean webProjectStartupRequested)
-{
- isWebProjectStartupRequested_ = webProjectStartupRequested;
-}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetMatcher.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetMatcher.java
deleted file mode 100644
index 26fd2e7..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetMatcher.java
+++ /dev/null
@@ -1,61 +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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.common;
-
-import java.util.Set;
-
-public class FacetMatcher
-{
- private boolean match;
- private Set facetsTested;
- private Set facetsThatMatched;
- private Set facetsToAdd;
-
- public Set getFacetsThatMatched()
- {
- return facetsThatMatched;
- }
- public void setFacetsThatMatched(Set facetsThatMatched)
- {
- this.facetsThatMatched = facetsThatMatched;
- }
- public Set getFacetsToAdd()
- {
- return facetsToAdd;
- }
- public void setFacetsToAdd(Set facetsToAdd)
- {
- this.facetsToAdd = facetsToAdd;
- }
- public boolean isMatch()
- {
- return match;
- }
- public void setMatch(boolean match)
- {
- this.match = match;
- }
- public Set getFacetsTested()
- {
- return facetsTested;
- }
- public void setFacetsTested(Set facetsTested)
- {
- this.facetsTested = facetsTested;
- }
-
-
-
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetSetsByTemplateCache.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetSetsByTemplateCache.java
deleted file mode 100644
index 7d6535a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetSetsByTemplateCache.java
+++ /dev/null
@@ -1,154 +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
- * -------- -------- -----------------------------------------------------------
- * 20060131 121071 rsinha@ca.ibm.com - Rupam Kuehner (creation)
- * 20060427 126780 rsinha@ca.ibm.com - Rupam Kuehner
- * 20070402 151943 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.common;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
-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;
-import org.eclipse.wst.common.project.facet.core.VersionFormatException;
-
-
-/**
- * FacetSetsByTemplateCache caches the sets of facet version combinations for templates.
- */
-public class FacetSetsByTemplateCache
-{
- // single instance per workbench
- private static FacetSetsByTemplateCache instance_;
-
- //facetSetsByTemplateId_:
- //key: Object of type String. String id of an IFacetedProjectTemplate.
- //value: Object of Set[]. An array of Sets where each set contains elements of type IProjectFacetVersion.
- private Hashtable facetSetsByTemplateId_;
- /**
- * Returns a singleton instance of this class.
- *
- * @return A singleton FacetSetsByTemplateCache object.
- */
- public static synchronized FacetSetsByTemplateCache getInstance()
- {
- if (instance_ == null)
- {
- instance_ = new FacetSetsByTemplateCache();
- instance_.load();
- }
- return instance_;
- }
-
- private void load()
- {
- facetSetsByTemplateId_ = new Hashtable();
- }
-
- /**
- * Returns all the valid facet version combinations that can be derived from the fixed facets
- * of the given template. For example, if the template has two fixed facets, A and B,
- * and A has versions 1.0 and 2.0, B has versions 1.1, 2.1,
- * the following array of Sets will be returned (assuming for the sake of the example
- * that all the combinations are valid):<br/>
- * {Set1, Set2, Set3, Set4}, where<br/>
- * Set1 = [A1.0, B1.1]<br/>
- * Set2 = [A2.0, B1.1]<br/>
- * Set3 = [A1.0, B2.1]<br/>
- * Set4 = [A2.0, B2.1]<br/>
- * <br/>
- * @param templateId id of an {@link IFacetedProjectTemplate}
- * @return Set[] An array of Sets where each set contains elements of type {@link IProjectFacetVersion}.
- */
- public synchronized Set[] getFacetVersionCombinationsFromTemplate(String templateId)
- {
- //Return the cached combinations if present.
- Set[] cachedCombinations = (Set[])facetSetsByTemplateId_.get(templateId);
- if (cachedCombinations != null)
- {
- return cachedCombinations;
- }
- else
- {
-
- //Combinations have not yet been cached for the given template.
- //Determine the combinations and cache them.
- IFacetedProjectTemplate template = ProjectFacetsManager.getTemplate(templateId);
- Set fixedFacets = template.getFixedProjectFacets();
-
- //Create an array of arrays. Each element of the array will contain the array
- //of IProjectFacetVersions for each IProjectFacet in the set of fixed facets.
- Iterator itr = fixedFacets.iterator();
- ArrayList projectFacetVersionArrays = new ArrayList();
-
- while (itr.hasNext())
- {
- IProjectFacet facet = (IProjectFacet) itr.next();
- List versions = null;
- try
- {
- // Get the facet versions in ascending order.
- versions = facet.getSortedVersions(true);
- } catch (VersionFormatException e) {
- Set versionSet = facet.getVersions();
- Iterator versionSetItr = versionSet.iterator();
- versions = new ArrayList();
- while (versionSetItr.hasNext())
- {
- versions.add(itr.next());
- }
- } catch (CoreException e) {
- Set versionSet = facet.getVersions();
- Iterator versionSetItr = versionSet.iterator();
- versions = new ArrayList();
- while (versionSetItr.hasNext())
- {
- versions.add(itr.next());
- }
- }
-
- if (versions.size() > 0)
- {
- //Create an array of IProjectFacetVersions from versions.
- Iterator versionItr = versions.iterator();
- ArrayList arrayOfVersionsList = new ArrayList();
- while (versionItr.hasNext())
- {
- IProjectFacetVersion pfv = (IProjectFacetVersion)versionItr.next();
- arrayOfVersionsList.add(pfv);
- }
-
- //Add the array of versions to the list of arrays.
- projectFacetVersionArrays.add((IProjectFacetVersion[])arrayOfVersionsList.toArray(new IProjectFacetVersion[0]));
-
-
- }
- }
- Set[] allValidCombinationsArray = new HashSet[0];
- if (projectFacetVersionArrays.size()>0) {
- IProjectFacetVersion[][] arrayOfProjectFacetVersionArrays = (IProjectFacetVersion[][])projectFacetVersionArrays.toArray(new IProjectFacetVersion[0][0]);
- allValidCombinationsArray = FacetUtils.getFacetCombinations(arrayOfProjectFacetVersionArrays, true);
- facetSetsByTemplateId_.put(templateId, allValidCombinationsArray);
- }
-
- return allValidCombinationsArray;
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetUtils.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetUtils.java
deleted file mode 100644
index ecf4fb7..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetUtils.java
+++ /dev/null
@@ -1,1408 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2012 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * IBM Corporation. - initial API and implementation
- * 20070523 158230 kathy@ca.ibm.com - Kathy Chan
- * 20071219 213356 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
- * 20080429 213730 trungha@ca.ibm.com - Trung Ha
- * 20080507 229532 kathy@ca.ibm.com - Kathy Chan
- * 20090303 242635 mahutch@ca.ibm.com - Mark Hutchinson, Remove unnecessary UI dependencies from org.eclipse.jst.ws.consumption
- * 20100203 kchong@ca.ibm.com - Keith Chong, Java Facet change
- * 20120127 369959 kchong@ca.ibm.com - Yen Lu, Keith Chong - JavaFacetUtil needs to be updated to include Java 7
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.common;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-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.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.common.project.facet.core.JavaFacet;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.EjbFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.IEjbFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.AppClientFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.project.facet.IAppClientFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.IUtilityFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.UtilityFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.web.project.facet.IWebFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.web.project.facet.WebFacetInstallDataModelProvider;
-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.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-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.IFacetedProjectTemplate;
-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;
-import org.eclipse.wst.common.project.facet.core.VersionFormatException;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject.Action;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject.Action.Type;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-import org.eclipse.wst.common.project.facet.core.runtime.RuntimeManager;
-
-import com.ibm.icu.util.StringTokenizer;
-
-/**
- * FacetUtils contains utility methods related to facets and templates.
- * <br/><br/>
- * Terminology used in the Javadoc in this class
- * <ul>
- * <li><b>facet</b>: An {@link IProjectFacet}</li>
- * <li><b>facet version</b>: An {@link IProjectFacetVersion} </li>
- * <li><b>facet runtime</b>: An {@link IRuntime}</li>
- * <li><b>faceted project</b>: An {@link IFacetedProject}. A faceted project may be obtained
- * from an IProject (@see ProjectFacetsManager#create)</li>
- * <li><b>template</b>: An {@link IFacetedProjectTemplate}. Conceptually this is similar to a project type.</li>
- * <li><b>required facet version</b>: A {@link RequiredFacetVersion}. Used by serviceRuntimes and clientRuntimes
- * to identify what they require in terms of facet versions.</li>
- * </ul>
- */
-public class FacetUtils
-{
-
- private static IFacetOperationDelegate delegate; //if a delegate is plugged in, delegate some operations to it
- private static boolean failedToLoadDelegate = false;
- /**
- * Returns an array of valid projects. Valid projects include projects with the facets nature or
- * projects with the Java nature.
- * @return IProject[] an array of valid projects
- */
- public static IProject[] getAllProjects()
- {
- //Return all projects in the workspace that have the project facet nature or that do not have the project
- //facet nature but have the Java nature.
- IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
- ArrayList validProjects = new ArrayList();
- for (int i = 0; i < projects.length; i++)
- {
- try
- {
- IFacetedProject facProject = ProjectFacetsManager.create(projects[i]);
- if (facProject != null)
- {
- //Add it to the list
- validProjects.add(projects[i]);
- }
- else
- {
- if (ResourceUtils.isJavaProject(projects[i]))
- {
- validProjects.add(projects[i]);
- }
- }
- }
- catch (CoreException ce)
- {
- }
- }
- return (IProject[])validProjects.toArray(new IProject[]{});
- }
-
- /**
- * Returns the facet versions on the given project.
- * @param projectName name of an existing project.
- * @returns Set containing elements of type {@link IProjectFacetVersion}.
- * These are the facet versions currently installed on this project. If the project
- * is a Java project, facets are inferred from the Java project. Returns null
- * <ul>
- * <li>if the project is not a faceted project or a Java project or</li>
- * <li>if the project does not exist or</li>
- * <li>if the project is null</li>
- * </ul>
- */
- public static Set getFacetsForProject(String projectName)
- {
- Set facetVersions = null;
- IProject project = ProjectUtilities.getProject(projectName);
- if (project!=null && project.exists())
- {
- try
- {
- IFacetedProject fproject = ProjectFacetsManager.create(project);
- if (fproject != null)
- {
- facetVersions = fproject.getProjectFacets();
- } else
- {
- //If this is not a faceted project, it may still be okay if it is a Java project
- //and the client runtime supports a Java project.
- IJavaProject javaProject = null;
- if (ResourceUtils.isJavaProject(project))
- {
- javaProject = JavaCore.create(project);
- facetVersions = FacetUtils.getFacetsForJavaProject(javaProject);
- }
- }
- } catch (CoreException ce)
- {
- //Leaving the catch block empty. This method will return null if there
- //were any blow-ups in the facet API being called.
- }
- }
-
- return facetVersions;
-
- }
-
- /**
- * Returns the facet runtime the given project is bound to.
- * @param projectName name of an existing project
- * @return {@link IRuntime} the project is bound to. Returns null
- * <ul>
- * <li>if the project is not bound to a facet runtime</li>
- * <li>if the project does not exist</li>
- * <li>if the project is null</li>
- * </ul>
- */
- public static IRuntime getFacetRuntimeForProject(String projectName)
- {
- IProject project = ProjectUtilities.getProject(projectName);
- if (project!=null && project.exists())
- {
- try
- {
- IFacetedProject fproject = ProjectFacetsManager.create(project);
- if (fproject != null)
- {
- return fproject.getPrimaryRuntime();
- }
- } catch (CoreException ce)
- {
- //Leaving the catch block empty. This method will return null if there
- //were any blow-ups in the facet API being called.
- }
- }
-
- return null;
- }
-
-
- /**
- * Returns a set of combinations of facet versions derived from the facet versions
- * in the provided arrayOfProjectFacetVersionArrays. For example, if
- * arrayOfProjectFacetVersionArrays is a two dimenstional array of facet versions that has
- * a structure like this:<br/>
- * {{FacetA_version1, FacetA_version2},<br/>
- * {FacetB_version1},<br/>
- * {FacetC_version1, FacetC_version2}}<br/>
- * the following array of Sets will be returned:<br/>
- * {Set1, Set2, Set3, Set4}, where<br/>
- * Set1 = [FacetA_version1, FacetB_version1, FacetC_version1]<br/>
- * Set2 = [FacetA_version2, FacetB_version1, FacetC_version1]<br/>
- * Set3 = [FacetA_version1, FacetB_version1, FacetC_version2]<br/>
- * Set4 = [FacetA_version2, FacetB_version1, FacetC_version2]<br/>
- * <br/>
- * @param arrayOfProjectFacetVersionArrays a two dimensional array containing elements
- * of type {@link IProjectFacetVersion}
- * @param returnValidOnly false if all combinations of facet versions are to be returned.
- * true if only valid combinations of facet versions are to be returned.
- * @return Set[] an array of Sets, where each Set contains elements of type {@link IProjectFacetVersion}.
- */
- public static Set[] getFacetCombinations(IProjectFacetVersion[][] arrayOfProjectFacetVersionArrays, boolean returnValidOnly)
- {
- ArrayList allCombinations = new ArrayList();
- //maxCount contains the number of versions in each array of IProjectFacetVersions.
- //initialize counter, which will be used to navigate arrayOfProjectFacetVersionArrays.
- int n = arrayOfProjectFacetVersionArrays.length;
- int[] maxCount = new int[n];
- int[] counter = new int[n];
- for (int i=0; i<n; i++)
- {
- maxCount[i] = arrayOfProjectFacetVersionArrays[i].length - 1;
- counter[i] = 0;
- }
-
- //Navigate arrayOfProjectFacetVersionArrays to create all possible combinations.
- boolean done = false;
- while (!done)
- {
- //Create a combination of size n using current values in counter.
- //Add it to the list of all combinations, checking first for validity if returnValidOnly is true.
- Set combination = new HashSet();
- for (int j=0; j<n; j++)
- {
- IProjectFacetVersion pfv = arrayOfProjectFacetVersionArrays[j][counter[j]];
- combination.add(pfv);
- }
-
- //Check if valid.
- if (returnValidOnly)
- {
- Set actions = getInstallActions(combination);
- try {
- if( ProjectFacetsManager.check( new HashSet(), actions ).getSeverity() == IStatus.OK )
- {
- allCombinations.add((combination));
- }
- } catch (Throwable e) {
- // Do nothing if ProjectFacetsManager.check() throws exception.
- // TODO This try/catch will be unneccesary once WTP bug 137551 is fixed so that an OK Status
- // would not be returned when an exception is thrown.
- }
- }
- else
- {
- allCombinations.add((combination));
- }
-
- //Update the counters.
- for (int p=0; p<n; p++)
- {
- if ( (counter[p] + 1) <= maxCount[p])
- {
- (counter[p])++;
- break;
- }
- else
- {
- counter[p] = 0;
- if (p == n-1)
- {
- done = true;
- }
- }
- }
- }
-
- Set[] allCombinationsArray = (Set[])allCombinations.toArray(new Set[0]);
- return allCombinationsArray;
- }
-
- /**
- * Returns a set of facet versions given a template. The highest facet version of every fixed
- * facet in the template is returned, with the exception of the jst.java facet, where the 1.4
- * facet version is returned.
- *
- * @param templateId id of a {@link IFacetedProjectTemplate}
- * @return Set containing elements of type {@link IProjectFacetVersion}
- */
- public static Set getInitialFacetVersionsFromTemplate(String templateId)
- {
- IFacetedProjectTemplate template = ProjectFacetsManager.getTemplate(templateId);
- Set fixedFacets = template.getFixedProjectFacets();
- HashSet initial = new HashSet();
- for (Iterator itr2 = fixedFacets.iterator(); itr2.hasNext(); )
- {
- IProjectFacet facet = (IProjectFacet) itr2.next();
- IProjectFacetVersion highestFacetVersion = null;
- try {
- if (isJavaFacet(facet)) //special case the java facet because 1.4 is a better default than 5.0 for now.
- {
- highestFacetVersion = facet.getVersion("1.4");
- } else {
- highestFacetVersion = facet.getLatestVersion();
- }
- } catch (VersionFormatException e) {
- } catch (CoreException e) {
- }
- initial.add(highestFacetVersion);
- }
-
- return initial;
- }
-
- /**
- * Returns a set of facet versions given a template. The default facet version of every fixed
- * facet in the template is returned. If unable to get default versions, an empty set will be returned.
- *
- * @param templateId id of a {@link IFacetedProjectTemplate}
- * @return Set containing elements of type {@link IProjectFacetVersion}
- */
- public static Set getDefaultFacetVersionsFromTemplate(String templateId)
- {
- HashSet defaultSet = new HashSet();
- try {
- IFacetedProjectTemplate template = ProjectFacetsManager.getTemplate(templateId);
- Set fixedFacets = template.getFixedProjectFacets();
- for (Iterator itr2 = fixedFacets.iterator(); itr2.hasNext(); )
- {
- IProjectFacet facet = (IProjectFacet) itr2.next();
- IProjectFacetVersion defaultFacetVersion = null;
- defaultFacetVersion = facet.getDefaultVersion();
- defaultSet.add(defaultFacetVersion);
- }
- return defaultSet;
- } catch (IllegalArgumentException e) {
- return defaultSet;
- } catch (VersionFormatException e) {
- return defaultSet;
- }
-
- }
-
- /**
- * Returns the template lables corresponding to the provided templateIds.
- * @param templateIds array of valid template ids. Each id must correspond to a {@link IFacetedProjectTemplate}.
- * @return String[] array of template labels.
- */
- public static String[] getTemplateLabels(String[] templateIds)
- {
- String[] labels = new String[templateIds.length];
- for (int i=0; i<templateIds.length; i++)
- {
- IFacetedProjectTemplate template = ProjectFacetsManager.getTemplate(templateIds[i]);
- labels[i] = template.getLabel();
- }
- return labels;
-
- }
-
- /**
- * Returns the id of a template given its label.
- *
- * @param templateLabel label of a template
- * @return template id or empty String if no {@link IFacetedProjectTemplate} with the
- * given templateLabel could be found.
- */
- public static String getTemplateIdByLabel(String templateLabel)
- {
- for( Iterator itr = ProjectFacetsManager.getTemplates().iterator(); itr.hasNext(); )
- {
- final IFacetedProjectTemplate template = (IFacetedProjectTemplate) itr.next();
- if (template.getLabel().equals(templateLabel))
- {
- return template.getId();
-
- }
- }
-
- return "";
- }
-
- /**
- * Returns the label of a template given its id
- *
- * @param templateId id of a {@link IFacetedProjectTemplate}
- * @return template label
- */
- public static String getTemplateLabelById(String templateId)
- {
- IFacetedProjectTemplate template = ProjectFacetsManager.getTemplate(templateId);
- return template.getLabel();
- }
-
- /**
- * Returns a set of install actions for the provided facet version
- *
- * @param projectFacetVersions Set containing elements of type {@link IProjectFacetVersion}
- * @return Set containing elements of type {@link Action} with the type attribute set to Type.INSTALL
- * The set contains one Action for each {@link IProjectFacetVersion} in projectFacetVersions.
- */
- public static Set getInstallActions(Set projectFacetVersions)
- {
- HashSet actions = new HashSet();
-
- Iterator facets = projectFacetVersions.iterator();
-
- while(facets.hasNext())
- {
- IProjectFacetVersion fv = (IProjectFacetVersion)facets.next();
- if (fv != null) {
- IProjectFacet pf = fv.getProjectFacet();
- Action action = new Action(Type.INSTALL, fv, getConfigObject(pf));
- actions.add(action);
- }
- }
-
- return actions;
- }
-
- /**
- * Returns the data model config object for the given project facet
- * For J2EE facets, set Add_TO_EAR properties of the data model to false,
- * for other facets, just return null
- * @param facetID
- * @return data model config object
- */
- public static Object getConfigObject(IProjectFacet projectFacet)
- {
-
- IDataModel dm = null;
- if (projectFacet != null) {
- String facetId = projectFacet.getId();
- if (facetId != null) {
- // set Add to EAR to false
- if (facetId.equals(IModuleConstants.JST_WEB_MODULE)) {
- dm = DataModelFactory.createDataModel(new WebFacetInstallDataModelProvider());
- dm.setBooleanProperty(IWebFacetInstallDataModelProperties.ADD_TO_EAR, false);
- } else if (facetId.equals(IModuleConstants.JST_EJB_MODULE)) {
- dm = DataModelFactory.createDataModel(new EjbFacetInstallDataModelProvider());
- dm.setBooleanProperty(IEjbFacetInstallDataModelProperties.ADD_TO_EAR, false);
- } else if (facetId.equals(IModuleConstants.JST_APPCLIENT_MODULE)) {
- dm = DataModelFactory.createDataModel(new AppClientFacetInstallDataModelProvider());
- dm.setBooleanProperty(IAppClientFacetInstallDataModelProperties.ADD_TO_EAR, false);
- } else if (facetId.equals(IModuleConstants.JST_UTILITY_MODULE)) {
- dm = DataModelFactory.createDataModel(new UtilityFacetInstallDataModelProvider());
- dm.setBooleanProperty(IUtilityFacetInstallDataModelProperties.ADD_TO_EAR, false);
- }
- }
- }
- return dm;
- }
- /**
- * Returns the {@link FacetMatcher} calculated when checking the required facet versions
- * against the facet versions.
- *
- * @param requiredFacetVersions array of required facet versions
- * @param projectFacetVersions facet versions to check against. Set containing elements of type
- * {@link IProjectFacetVersion}
- * @return FacetMatcher with the following characteristics:
- * <ul>
- * <li><b>isMatch</b>: returns true if the required facet versions already exist in the facet versions
- * or can be added to the facet versions. isMatch will return false otherwise.</li>
- * <li><b>getFacetsTested</b>: returns the same set of facet versions as the input parameter, projectFacetVersions</li>
- * <li><b>getFacetsThatMatched</b>: if isMatch returns false, getFacetsThatMatched returns null. If isMatch returns true,
- * getFacetsThatMatched returns the subset of facet versions in the input parameter, projectFacetVersions,
- * that matched one of the required facet versions. This may be an empty set.</li>
- * <li><b>getFacetsToAdd</b>: if isMatch returns false, getFacetsToAdd returns null. If isMatch returns true,
- * getFacetsToAdd returns the subset of facet versions that would need to be added to the facet versions in
- * projectFacetVersions in order to satisfy the requirements of the required facet versions. This may be
- * an empty set.</li>
- * </ul>
- */
- public static FacetMatcher match(RequiredFacetVersion[] requiredFacetVersions, Set projectFacetVersions)
- {
- FacetMatcher fm = new FacetMatcher();
- fm.setFacetsTested(projectFacetVersions);
- HashSet facetsToAdd = new HashSet();
- HashSet requiredFacetVersionsToAdd = new HashSet();
- HashSet facetsThatMatched = new HashSet();
- for (int i=0; i<requiredFacetVersions.length; i++)
- {
- RequiredFacetVersion rfv = requiredFacetVersions[i];
- IProjectFacetVersion rpfv = rfv.getProjectFacetVersion();
- String rid = rpfv.getProjectFacet().getId();
- String rv = rpfv.getVersionString();
- boolean facetPresent = false;
-
- //Is the project facet present? or a later version of applicable.
- Iterator itr = projectFacetVersions.iterator();
- while(itr.hasNext())
- {
- IProjectFacetVersion pfv = (IProjectFacetVersion)itr.next();
- String id = pfv.getProjectFacet().getId();
- String version = pfv.getVersionString();
- if (rid.equals(id))
- {
- if (rv.equals(version))
- {
- //found an exact match
- facetPresent = true;
- facetsThatMatched.add(pfv);
- }
- else
- {
- if (rfv.getAllowNewer())
- {
- if (greaterThan(version, rv))
- {
- //found a match
- facetPresent = true;
- facetsThatMatched.add(pfv);
- }
- }
- }
- //No need to keep iterating since we hit a facet with the same id;
- break;
- }
- }
-
- //if not present, put it in the list to check if it can be added.
- if (!facetPresent)
- {
- facetsToAdd.add(rpfv);
- requiredFacetVersionsToAdd.add(rfv);
- }
-
- }
-
- //Check if the facetsToAdd can be added
- if (requiredFacetVersionsToAdd.size() > 0)
- {
- //Test all possible combinations of the facets that need to be added
- //Create an array of arrays. Each element of the array will contain the array
- //of the permitted IProjectFacetVersions for each required facet.
- boolean facetsCanBeAdded = false;
- Iterator itr = requiredFacetVersionsToAdd.iterator();
- ArrayList projectFacetVersionArrays = new ArrayList();
-
- while (itr.hasNext())
- {
- RequiredFacetVersion reqFacetVersion = (RequiredFacetVersion) itr.next();
- IProjectFacetVersion[] versions = reqFacetVersion.getAllowedProjectFacetVersions();
- if (versions != null && versions.length > 0)
- {
- //Add the array of versions to the list of arrays.
- projectFacetVersionArrays.add(versions);
- }
- }
-
- IProjectFacetVersion[][] arrayOfProjectFacetVersionArrays = (IProjectFacetVersion[][])projectFacetVersionArrays.toArray(new IProjectFacetVersion[0][0]);
- Set[] combinations = getFacetCombinations(arrayOfProjectFacetVersionArrays, false);
- for (int i=0; i<combinations.length; i++)
- {
- //Check if the set can be added. If so, this is a match. Update the facet matcher and break.
- Set actions = getInstallActions(combinations[i]);
- try {
- if( ProjectFacetsManager.check( projectFacetVersions, actions ).getSeverity() == IStatus.OK )
- {
- //Facets can be added so there is a match
- facetsCanBeAdded=true;
- fm.setMatch(true);
- fm.setFacetsThatMatched(facetsThatMatched);
- fm.setFacetsToAdd(combinations[i]);
- break;
- }
- } catch (Throwable e) {
- // Do nothing if ProjectFacetsManager.check() throws exception.
- // TODO This try/catch will be unneccesary once WTP bug 137551 is fixed so that an OK Status
- // would not be returned when an exception is thrown.
- }
- }
-
-
- if (!facetsCanBeAdded)
- {
- fm.setMatch(false);
- }
- }
- else
- {
- //There are no facets to add.
- fm.setMatch(true);
- fm.setFacetsThatMatched(facetsThatMatched);
- fm.setFacetsToAdd(facetsToAdd);
- }
-
- return fm;
- }
-
- /**
- * Adds facet versions to the provided project if required based on checking provided
- * required facet versions against the facet versions already installed on project.
- *
- * @param project IProject which exists in the workspace
- * @param rfvs array of required facet versions.
- * @param monitor progress monitor
- * @return IStatus with severity IStatus.ERROR
- * <ul>
- * <li>if the project does not exist or</li>
- * <li>if the project is not open or</li>
- * <li>an attempt to add facet versions to the project resulted in an error.</li>
- * </ul>
- * Otherwise, returns an IStatus with severity IStatus.OK
- */
- public static IStatus addRequiredFacetsToProject(IProject project, RequiredFacetVersion[] rfvs, IProgressMonitor monitor)
- {
- IStatus status = Status.OK_STATUS;
-
- Set missingFacets = null;
- Set facetsToAdd = new HashSet();
- try
- {
- IFacetedProject fProject = ProjectFacetsManager.create(project);
- if (fProject != null)
- {
- Set projectFacetVersions = fProject.getProjectFacets();
- FacetMatcher projectFacetMatcher = FacetUtils.match(rfvs, projectFacetVersions);
- if (projectFacetMatcher.isMatch())
- {
- missingFacets = projectFacetMatcher.getFacetsToAdd();
- if (missingFacets.size() > 0)
- {
- IRuntime fRuntime = null;
- fRuntime = FacetUtils.getFacetRuntimeForProject(project.getName());
- if (fRuntime != null)
- {
- //Add the highest version supported by the runtime the project is bound to.
- Iterator missingFacetsItr = missingFacets.iterator();
- while (missingFacetsItr.hasNext())
- {
- IProjectFacet facet = ((IProjectFacetVersion)missingFacetsItr.next()).getProjectFacet();
- //Get the highest level of this facet supported by the runtime.
- List versions = null;
- try {
- versions = facet.getSortedVersions(false);
- } catch (VersionFormatException e) {
- Set versionSet = facet.getVersions();
- Iterator itr = versionSet.iterator();
- versions = new ArrayList();
- while (itr.hasNext())
- {
- versions.add(itr.next());
- }
- } catch (CoreException e) {
- Set versionSet = facet.getVersions();
- Iterator itr = versionSet.iterator();
- versions = new ArrayList();
- while (itr.hasNext())
- {
- versions.add(itr.next());
- }
- }
-
- //Iterate over the versions in descending order and pick the
- //first one that fRuntime supports.
- Iterator versionsItr = versions.iterator();
- while(versionsItr.hasNext())
- {
- boolean match = false;
- IProjectFacetVersion pfv = (IProjectFacetVersion)versionsItr.next();
- Set pfvs = new HashSet();
- pfvs.add(pfv);
-
- //Check the required facets to see if this version of this facet is supported.
- for (int j=0; j<rfvs.length; j++)
- {
- RequiredFacetVersion rfv = rfvs[j];
- IProjectFacetVersion rpfv = rfv.getProjectFacetVersion();
- if (rpfv.getProjectFacet().getId().equals(pfv.getProjectFacet().getId()))
- {
- if (rpfv.getVersionString().equals(pfv.getVersionString()))
- {
- match = true;
- }
- else
- {
- if (rfv.getAllowNewer())
- {
- if (greaterThan(pfv.getVersionString(), rpfv.getVersionString()))
- {
- match = true;
- }
- }
- }
- }
- }
-
- if (match)
- {
- //Check against Runtime
- if (FacetUtils.doesRuntimeSupportFacets(fRuntime, pfvs))
- {
- //We have a match. Add this one to the master set.
- facetsToAdd.add(pfv);
- break;
- }
- }
- }
- }
- }
- else
- {
- facetsToAdd = missingFacets;
- }
-
- status = addFacetsToProject(fProject, facetsToAdd);
- }
- }
- }
- } catch (CoreException ce)
- {
- //Display an appropriate error message to the user.
- //A CoreException could have been thrown for any of the following three reasons
- //1. The project does not exist
- //2. The project is not open
- //3. There was a problem adding the facets to the project.
-
- if (!project.exists())
- {
- status = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_PROJECT_DOES_NOT_EXIST, new String[] { project.getName()}));
- }
- else if (!project.isOpen())
- {
- status = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_PROJECT_IS_NOT_OPEN, new String[] { project.getName()}));
- }
- else
- {
- status = getErrorStatusForAddingFacets(project.getName(), facetsToAdd, ce);
- }
- }
-
- return status;
- }
-
-
- /**
- * Adds the provided set of facet versions to the provided faceted project
- *
- * @param fproject A faceted project which exists in the workspace
- * @param projectFacetVersions A set containing elements of type {@link IProjectFacetVersion}
- * @return An IStatus with a severity of IStatus.OK if the facet
- * versions were added successfully. Otherwise, an IStatus with a severity of
- * IStatus.ERROR.
- */
- public static IStatus addFacetsToProject(final IFacetedProject fproject, final Set projectFacetVersions)
- {
- final IStatus[] status = new IStatus[1];
- status[0] = Status.OK_STATUS;
- final Set actions = getInstallActions(projectFacetVersions);
-
- if (isExtensionPresent())
- {
- status[0] = delegate.addFacetsToProject(fproject, projectFacetVersions);
- }
- else
- {
- try
- {
- fproject.modify(actions, null);
- } catch (CoreException e)
- {
- status[0] = getErrorStatusForAddingFacets(fproject.getProject().getName(), projectFacetVersions, e);
- }
- }
-
- return status[0];
- }
-
- /**
- * Returns an error status indicating that the facet versions could not be
- * added to the faceted project
- *
- * @param projectName a project name to insert in the error message in the IStatus
- * @param projectFacetVersions a set containing elements of type {@link IProjectFacetVersion}.
- * The facets in this set will be listed in the error message in the IStatus.
- * @param t a Throwable which will be inserted in the IStatus
- * @return an IStatus with severity IStatus.ERROR
- */
- private static IStatus getErrorStatusForAddingFacets(String projectName, Set projectFacetVersions, Throwable t)
- {
- IStatus status = Status.OK_STATUS;
- int size = projectFacetVersions.size();
- if (size > 0)
- {
- Set facets = new HashSet();
- //Iterate over projectFacetVersions to form a set of IProjectFacets
- Iterator itr = projectFacetVersions.iterator();
- while (itr.hasNext())
- {
- IProjectFacetVersion projectFacet = (IProjectFacetVersion)itr.next();
- IProjectFacet facet = projectFacet.getProjectFacet();
- facets.add(facet);
- }
- String facetList = getFacetListMessageString(facets);
- status = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_ADDING_FACETS_TO_PROJECT, new String[] { projectName, facetList}), t);
- }
-
- return status;
- }
-
- /**
- * Creates a new faceted project with the provided name
- *
- * @param projectName A String containing the name of the project to be created
- * @return An IStatus with a severity of IStatus.OK if the faceted project
- * was created successfully or if a project of the provided name already
- * exists in the workspace. Otherwise, an IStatus with severity of
- * IStatus.ERROR.
- */
- public static IStatus createNewFacetedProject(final String projectName)
- {
- final IStatus[] status = new IStatus[1];
- status[0] = Status.OK_STATUS;
- IProject project = ProjectUtilities.getProject(projectName);
-
- if (!project.exists())
- {
- if (isExtensionPresent())
- {
- status[0] = delegate.createNewFacetedProject(projectName);
- }
- else
- {
- try
- {
- IFacetedProject fProject = ProjectFacetsManager.create(projectName, null, null);
- if (fProject == null)
- {
- status[0] = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_PROJECT_CREATION, new String[] { projectName }));
- }
- }
- catch (CoreException e)
- {
- status[0] = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_PROJECT_CREATION, new String[] { projectName }), e);
- }
- }
- }
- return status[0];
- }
-
- /**
- * Sets the provided set of facets as fixed on the faceted project
- *
- * @param fProject A faceted project which exists in the workspace
- * @param fixedFacets A set containing elements of type {@link IProjectFacet}
- * @return An IStatus with a severity of IStatus.OK if the facets
- * were successfully set as fixed facets on the faceted project.
- * Otherwise, an IStatus with a severity of IStatus.ERROR.
- *
- * @see IFacetedProject#setFixedProjectFacets
- */
- public static IStatus setFixedFacetsOnProject(final IFacetedProject fProject, final Set fixedFacets)
- {
- final IStatus[] status = new IStatus[1];
- status[0] = Status.OK_STATUS;
-
- if (isExtensionPresent())
- {
- status[0] = delegate.setFixedFacetsOnProject(fProject, fixedFacets);
- }
- else
- {
- try
- {
- fProject.setFixedProjectFacets(fixedFacets);
- } catch (CoreException e)
- {
- status[0] = getErrorStatusForSettingFixedFacets(fProject.getProject().getName(), fixedFacets, e);
- }
- }
-
- return status[0];
- }
-
- /**
- * Returns an error status indicating that the facets could not be
- * set as fixed facets on the faceted project
- *
- * @param projectName a project name to insert in the error message in the IStatus
- * @param facets a set containing elements of type {@link IProjectFacet}.
- * The facets in this set will be listed in the error message in the IStatus.
- * @param t a Throwable which will be inserted in the IStatus
- * @return an IStatus with severity IStatus.ERROR
- */
- private static IStatus getErrorStatusForSettingFixedFacets(String projectName, Set facets, Throwable t)
- {
- IStatus status = Status.OK_STATUS;
- int size = facets.size();
- if (size > 0)
- {
- String facetList = getFacetListMessageString(facets);
- status = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_FIXED_FACETS, new String[] { projectName, facetList}), t);
- }
-
- return status;
- }
-
-
- /**
- * Binds the faceted project to the facet runtime
- *
- * @param fProject A faceted project which exists in the workspace
- * @param fRuntime A facet runtime
- * @return An IStatus with a severity of IStatus.OK if the faceted project
- * was bound to the facet runtime successfully. Otherwise, an IStatus with severity of
- * IStatus.ERROR.
- */
- public static IStatus setFacetRuntimeOnProject(final IFacetedProject fProject, final IRuntime fRuntime)
- {
- final IStatus[] status = new IStatus[1];
- status[0] = Status.OK_STATUS;
-
- if (isExtensionPresent())
- {
- status[0] = delegate.setFacetRuntimeOnProject(fProject, fRuntime);
- }
- else
- {
- try
- {
- fProject.setTargetedRuntimes(Collections.singleton(fRuntime), null); //jvh - happens here...
- } catch (CoreException e)
- {
- status[0] = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_SETTING_RUNTIME, new String[] { fProject.getProject().getName(), fRuntime.getName() }), e);
- }
- }
- return status[0];
- }
-
- /**
- * Returns a translatable delimited list of facet labels derived from the provided
- * set of facets
- *
- * @param facets a set containing elements of type {@link IProjectFacet}
- * @return String a delimited list of facet labels
- */
- private static String getFacetListMessageString(Set facets)
- {
- String facetListMessage = "";
- int size = facets.size();
- if (size > 0)
- {
- Iterator itr = facets.iterator();
- IProjectFacet firstProjectFacet = (IProjectFacet)itr.next();
- facetListMessage = firstProjectFacet.getLabel();
-
- //Continue appending to facetListMessage until all the facet labels
- //are in the list.
- while (itr.hasNext())
- {
- IProjectFacet projectFacet = (IProjectFacet)itr.next();
- String pfLabel = projectFacet.getLabel();
- facetListMessage = NLS.bind(ConsumptionMessages.MSG_FACETS, new String[] {facetListMessage, pfLabel});
- }
- }
-
- return facetListMessage;
- }
-
-
- /**
- * Returns the set of facet versions which can be inferred from the provided Java project
- *
- * @param javaProject a Java project that exists in the workspace. Must not be null.
- * @return Set containing elements of type {@link IProjectFacetVersion}
- */
- public static Set getFacetsForJavaProject(IJavaProject javaProject)
- {
- Set facets = new HashSet();
- String jdkComplianceLevel = null;
- if (javaProject!=null)
- {
- jdkComplianceLevel = javaProject.getOption("org.eclipse.jdt.core.compiler.compliance", false);
- if (jdkComplianceLevel == null)
- {
- jdkComplianceLevel = JavaCore.getOption(JavaCore.COMPILER_COMPLIANCE);
- if (jdkComplianceLevel == null)
- {
- jdkComplianceLevel = "1.4";
- }
- }
- }
-
- IProjectFacet javaFacet = ProjectFacetsManager.getProjectFacet(JavaFacet.ID);
- IProjectFacetVersion javaFacetVersion = null;
- if (jdkComplianceLevel.equals("1.3"))
- {
- javaFacetVersion = javaFacet.getVersion("1.3");
- }
- else if (jdkComplianceLevel.equals("1.4"))
- {
- javaFacetVersion = javaFacet.getVersion("1.4");
- }
- else if (jdkComplianceLevel.equals("1.5"))
- {
- javaFacetVersion = JavaFacet.JAVA_50;
- }
- else if (jdkComplianceLevel.equals("1.6"))
- {
- javaFacetVersion = JavaFacet.JAVA_60;
- }
- else if (jdkComplianceLevel.equals("1.7"))
- {
- javaFacetVersion = JavaFacet.VERSION_1_7;
- }
- else
- {
- javaFacetVersion = javaFacet.getVersion("1.4");
- }
-
- facets.add(javaFacetVersion);
- IProjectFacet utilityFacet = ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_UTILITY_MODULE);
- IProjectFacetVersion utilityFacetVersion = null;
- try
- {
- utilityFacetVersion = utilityFacet.getLatestVersion();
- }
- catch (CoreException ce)
- {
-
- }
- if (utilityFacetVersion != null)
- {
- facets.add(utilityFacetVersion);
- }
- return facets;
- }
-
-
- //Methods related to facet runtimes.
-
- /**
- * Returns a set of facet runtimes that support the given
- * required facet versions.
- * @param requiredFacetVersions an array containing elements of type {@link RequiredFacetVersion}
- * @return Set set of facet runtimes that support the given required facet versions.
- * (element type: {@link IRuntime})
- */
- public static Set getRuntimes(RequiredFacetVersion[] requiredFacetVersions)
- {
- //Form the sets of IProjectFacetVersions these RequiredFacetVersions represent.
- ArrayList listOfFacetSets = new ArrayList();
-
- HashSet facets = new HashSet();
- int javaFacetIndex = -1;
- for (int i=0; i<requiredFacetVersions.length; i++)
- {
- IProjectFacetVersion pfv = requiredFacetVersions[i].getProjectFacetVersion();
- if (FacetUtils.isJavaFacet(pfv.getProjectFacet()))
- {
- //Remember the index
- javaFacetIndex = i;
- }
- facets.add(requiredFacetVersions[i].getProjectFacetVersion());
- }
-
- listOfFacetSets.add(facets);
-
- //If the java facet was one of the facets in the set, and new versions of java are allowed,
- //create sets that contain the newer permitted versions of the java facets.
- if (javaFacetIndex > -1)
- {
- ArrayList permittedJavaVersions = new ArrayList();
- RequiredFacetVersion rfv = requiredFacetVersions[javaFacetIndex];
- if (rfv.getAllowNewer())
- {
- String version = rfv.getProjectFacetVersion().getVersionString();
- Set allVersions = rfv.getProjectFacetVersion().getProjectFacet().getVersions();
- Iterator itr = allVersions.iterator();
- while (itr.hasNext())
- {
- IProjectFacetVersion thisPfv = (IProjectFacetVersion)itr.next();
- String thisVersion = thisPfv.getVersionString();
- if (greaterThan(thisVersion, version))
- {
- permittedJavaVersions.add(thisVersion);
- }
- }
-
- String[] javaVersions = (String[])permittedJavaVersions.toArray(new String[0]);
-
- for (int j=0; j<javaVersions.length; j++)
- {
- HashSet thisFacetSet = new HashSet();
-
- for (int k=0; k<requiredFacetVersions.length; k++)
- {
- if (k==javaFacetIndex)
- {
- IProjectFacetVersion pfv = requiredFacetVersions[k].getProjectFacetVersion().getProjectFacet().getVersion(javaVersions[j]);
- thisFacetSet.add(pfv);
- }
- else
- {
- IProjectFacetVersion pfv = requiredFacetVersions[k].getProjectFacetVersion();
- thisFacetSet.add(pfv);
- }
- }
-
- listOfFacetSets.add(thisFacetSet);
- }
- }
- }
-
- //Return the union of runtimes for all the facetSets.
- return getRuntimes((Set[])listOfFacetSets.toArray(new Set[0]));
-
- }
-
- /**
- * Returns whether or not the provided facet runtime supports the provided
- * required facet versions.
- *
- * @param requiredFacetVersions an array containing elements of type {@link RequiredFacetVersion}
- * @param fRuntimeName name of a {@link IRuntime}
- * @return boolean <code>true</code> if the facet runtime supports the required facet versions.
- * Returns <code>false</code> otherwise.
- */
- public static boolean isFacetRuntimeSupported(RequiredFacetVersion[] requiredFacetVersions, String fRuntimeName)
- {
- Set fRuntimes = getRuntimes(requiredFacetVersions);
- Iterator itr = fRuntimes.iterator();
- while (itr.hasNext())
- {
- IRuntime runtime = (IRuntime)itr.next();
- if (runtime.getName().equals(fRuntimeName))
- {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * Returns the union of facet runtimes that support the provided sets of facet versions.
- *
- * @param facetSets array of Sets, where each Set contains elements of type {@link IProjectFacetVersion}.
- * @return Set containing elements of type {@link IRuntime}
- */
- public static Set getRuntimes(Set[] facetSets)
- {
- HashSet unionSet = new HashSet();
- for (int i=0; i<facetSets.length; i++)
- {
- Set facets = facetSets[i];
- Set runtimes = RuntimeManager.getRuntimes(facets);
- Iterator itr = runtimes.iterator();
- while (itr.hasNext())
- {
- IRuntime runtime = (IRuntime)itr.next();
- if (!unionSet.contains(runtime))
- {
- unionSet.add(runtime);
- }
- }
- }
- return unionSet;
- }
-
- /**
- * Returns whether or not the provided facet runtime supports the provided set of facet versions.
- *
- * @param facetRuntime a facet runtime
- * @param projectFacetVersions set containing elements of type {@link IProjectFacetVersion}
- * @return boolean <code>true</code> if the facet runtime supports the provided set of facet versions.
- * Returns <code>false</code> otherwise.
- */
- public static boolean doesRuntimeSupportFacets(IRuntime facetRuntime, Set projectFacetVersions)
- {
- if ( facetRuntime == null || projectFacetVersions == null)
- return false;
-
- Set runtimes = RuntimeManager.getRuntimes(projectFacetVersions);
- Iterator itr = runtimes.iterator();
- while (itr.hasNext())
- {
- IRuntime runtime = (IRuntime)itr.next();
- if (runtime.getName().equals(facetRuntime.getName()))
- {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * Returns whether versionA is greater than versionB
- *
- * @param versionA version number of the form 1.2.3
- * @param versionA version number of the form 1.2.3
- * @return boolean <code>true</code> if versionA is greater than versionB, <code>false</code> otherwise.
- */
- public static boolean greaterThan(String versionA, String versionB)
- {
- if (versionA == null || versionB == null)
- return false;
-
- StringTokenizer stA = new StringTokenizer(versionA, ".");
- StringTokenizer stB = new StringTokenizer(versionB, ".");
-
- int sizeA = stA.countTokens();
- int sizeB = stB.countTokens();
-
- int size;
- if (sizeA < sizeB)
- {
- size = sizeA;
- }
- else
- size = sizeB;
-
- for (int i=0; i<size; i++)
- {
- int a = Integer.parseInt(stA.nextToken());
- int b = Integer.parseInt(stB.nextToken());
- if (a!=b)
- {
- return a > b;
- }
- }
-
- return sizeA > sizeB;
- }
-
- /**
- * Returns whether the provided facet has an id the same as that of the java facet
- * @param pf facet
- * @return <code>true</code> if facet has an id the same as that of the java facet, <code>false</code> otherwise.
- */
- public static boolean isJavaFacet(IProjectFacet pf)
- {
- if (pf != null && pf.equals(JavaFacet.FACET))
- return true;
- else
- return false;
- }
-
- /**
- * Returns whether or not the provided project is a faceted Java utility project or a non-faceted Java project.
- *
- * @param project an IProject
- * @return boolean <code>true</code> if the provided project is a faceted Java utility project
- * or a non-faceted Java project, <code>false</code> otherwise.
- */
- public static boolean isJavaProject(IProject project)
- {
- if (project == null)
- return false;
-
- //Check if it's a faceted project
- try
- {
- IFacetedProject fProject = ProjectFacetsManager.create(project);
- if (fProject != null)
- {
- //Return true if it's a utility project
- if (J2EEUtils.isJavaComponent(project))
- {
- return true;
- }
- else
- {
- //See if the java facet is the only one it has.
- Set facets = fProject.getProjectFacets();
- if (facets.size()==1)
- {
- IProjectFacetVersion pfv = (IProjectFacetVersion)facets.iterator().next();
- if (isJavaFacet(pfv.getProjectFacet()))
- {
- return true;
- }
- }
- }
- }
- else
- {
- if (ResourceUtils.isJavaProject(project))
- {
- return true;
- }
- }
- } catch (CoreException ce)
- {
-
- }
-
- return false;
- }
-
- /**
- * Returns whether or not the provided template id is equal to "template.jst.utility"
- *
- * @param templateId template id
- * @return boolean <code>true</code> if the provided template id is equal to "template.jst.utility",
- * <code>false</code> otherwise.
- */
- public static boolean isUtilityTemplate(String templateId)
- {
- if (templateId != null && ProjectFacetsManager.isTemplateDefined(templateId))
- {
- if (templateId.equals("template.jst.utility"))
- {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * Returns the required facet version of a EAR that should contain the given project.
- *
- * @param project The project
- * @return An array of required facet versions. If no constraints can be inferred from the
- * project, an empty array is returned.
- */
- public static RequiredFacetVersion[] getRequiredEARFacetVersions(IProject project) {
-
- int version = 0;
-
- if (JavaEEProjectUtilities.isDynamicWebProject(project)) {
-
- version = J2EEVersionUtil.convertWebVersionStringToJ2EEVersionID(
- J2EEProjectUtilities.getJ2EEProjectVersion(project));
- }
- else if (JavaEEProjectUtilities.isEJBProject(project)) {
-
- version = J2EEVersionUtil.convertEJBVersionStringToJ2EEVersionID(
- J2EEProjectUtilities.getJ2EEProjectVersion(project));
- }
- else if (JavaEEProjectUtilities.isApplicationClientProject(project)) {
-
- version = J2EEVersionUtil.convertAppClientVersionStringToJ2EEVersionID(
- J2EEProjectUtilities.getJ2EEProjectVersion(project));
- }
- else
- // return empty array, no constraints
- return new RequiredFacetVersion[0];
-
- IProjectFacet projectFacet = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_EAR_MODULE);
- IProjectFacetVersion projectFacetVersion = projectFacet.getVersion(J2EEVersionUtil.convertVersionIntToString(version));
-
- RequiredFacetVersion[] rfv = new RequiredFacetVersion[1];
- rfv[0] = new RequiredFacetVersion();
- rfv[0].setAllowNewer(false);
- rfv[0].setProjectFacetVersion(projectFacetVersion);
-
- return rfv;
- }
-
- private static boolean isExtensionPresent() {
-
- if (failedToLoadDelegate) {
- return false;
- } if (delegate != null) {
- return true;
- }
- IExtensionRegistry registry = Platform.getExtensionRegistry();
- IExtensionPoint point = registry.getExtensionPoint("org.eclipse.jst.ws.consumption.internalFacetOperationDelegate");
- if (point == null) {
- failedToLoadDelegate = true;
- return false;
- }
- IExtension[] extensions = point.getExtensions();
-
- //this extension point is internal, we know there will only be zero or one plugged in
- if (extensions.length > 0 && extensions[0] != null) {
- IConfigurationElement[] elements = extensions[0].getConfigurationElements();
- if (elements.length > 0 && elements[0] != null) {
- try {
- delegate = (IFacetOperationDelegate)elements[0].createExecutableExtension("class");
- return true;
- } catch (CoreException e) {
- //do nothing, just report that we failed to load the extension
- }
- }
- }
- failedToLoadDelegate = true;//set this so we don't try to load it again
- return false;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FolderResourceFilter.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FolderResourceFilter.java
deleted file mode 100644
index cbec831..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FolderResourceFilter.java
+++ /dev/null
@@ -1,92 +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.consumption.common;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.AnyFilter;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.osgi.util.NLS;
-
-
-/**
-* This is a kind of Filter that accepts only objects
-* which indicate a Java resource. In particular, any
-* {@link org.eclipse.core.resources.IResource} whose
-* pathname, or any object whose string representation as
-* returned by <code>toString()</code>, ends in
-* "<code>.java</code>" or "<code>.class</code>" will be accepted.
-* All other objects will be rejected.
-*/
-public class FolderResourceFilter extends AnyFilter
-{
-
- /**
- * Constructs a new <code>JavaResourceFilter</code> that filters
- * "<code>.java</code>" and "<code>.class</code>" objects.
- * Equivalent to <code>JavaResourceFilter(ALL_FILES)</code>.
- */
- public FolderResourceFilter () { }
-
- /**
- * Returns the locale-specific name of this filter.
- * @return The locale-specific name of this filter.
- */
- public String getName ()
- {
- return ConsumptionMessages.FOLDER_FILTER_NAME;
- }
-
- /**
- * Returns the locale-specific description of this filter.
- * @return The locale-specific description of this filter.
- */
- public String getDescription ()
- {
- return ConsumptionMessages.FOLDER_FILTER_DESC;
- }
-
- public IStatus statusOf ( Object object )
- {
- if (object == null)
- {
- return new Status(
- IStatus.ERROR,
- WebServiceConsumptionPlugin.ID,
- 0,
- ConsumptionMessages.FILTER_MSG_ERROR_NULL_OBJECT,
- null
- );
- }
-
- String name = null;
-
- if (object instanceof IResource)
- {
- IResource resource = (IResource)object;
- name = resource.getFullPath().toString();
- if (resource.getType() != IResource.FOLDER)
- {
- return new Status(
- IStatus.ERROR,
- WebServiceConsumptionPlugin.ID,
- 0,
- NLS.bind(ConsumptionMessages.FILTER_MSG_ERROR_NOT_FOLDER,new Object[] {name}),
- null
- );
- }
- }
- return new Status(IStatus.OK,WebServiceConsumptionPlugin.ID,0,"",null);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/IFacetOperationDelegate.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/IFacetOperationDelegate.java
deleted file mode 100644
index 3d6a69d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/IFacetOperationDelegate.java
+++ /dev/null
@@ -1,72 +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
- * -------- -------- -----------------------------------------------------------
- * 20090303 242635 mahutch@ca.ibm.com - Mark Hutchinson, Remove unnecessary UI dependencies from org.eclipse.jst.ws.consumption
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.common;
-
-import java.util.Set;
-
-import org.eclipse.core.runtime.IStatus;
-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.runtime.IRuntime;
-
-public interface IFacetOperationDelegate {
-
- /**
- * Adds the provided set of facet versions to the provided faceted project
- *
- * @param fproject A faceted project which exists in the workspace
- * @param projectFacetVersions A set containing elements of type {@link IProjectFacetVersion}
- * @return An IStatus with a severity of IStatus.OK if the facet
- * versions were added successfully. Otherwise, an IStatus with a severity of
- * IStatus.ERROR.
- */
- public IStatus addFacetsToProject(final IFacetedProject fproject, final Set projectFacetVersions);
-
- /**
- * Creates a new faceted project with the provided name
- *
- * @param projectName A String containing the name of the project to be created
- * @return An IStatus with a severity of IStatus.OK if the faceted project
- * was created successfully or if a project of the provided name already
- * exists in the workspace. Otherwise, an IStatus with severity of
- * IStatus.ERROR.
- */
- public IStatus createNewFacetedProject(final String projectName);
-
- /**
- * Sets the provided set of facets as fixed on the faceted project
- *
- * @param fProject A faceted project which exists in the workspace
- * @param fixedFacets A set containing elements of type {@link IProjectFacet}
- * @return An IStatus with a severity of IStatus.OK if the facets
- * were successfully set as fixed facets on the faceted project.
- * Otherwise, an IStatus with a severity of IStatus.ERROR.
- *
- * @see IFacetedProject#setFixedProjectFacets
- */
- public IStatus setFixedFacetsOnProject(final IFacetedProject fProject, final Set fixedFacets);
-
- /**
- * Binds the faceted project to the facet runtime
- *
- * @param fProject A faceted project which exists in the workspace
- * @param fRuntime A facet runtime
- * @return An IStatus with a severity of IStatus.OK if the faceted project
- * was bound to the facet runtime successfully. Otherwise, an IStatus with severity of
- * IStatus.ERROR.
- */
- public IStatus setFacetRuntimeOnProject(final IFacetedProject fProject, final IRuntime fRuntime);
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/IServerDefaulter.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/IServerDefaulter.java
deleted file mode 100644
index fc1f1d9..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/IServerDefaulter.java
+++ /dev/null
@@ -1,36 +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.consumption.common;
-
-import org.eclipse.core.resources.IProject;
-
-
-/**
- * Implement this interface to provide logic that can be plugged into
- * the server defaulting algorithm.
- * (See the org.eclipse.jst.ws.consumption.serverDefaulter extension point)
- */
-public interface IServerDefaulter
-{
-
- /**
- * @param project
- * @return ServerInfo.
- * If no existing server or server type is recommended, return null.
- * If a server type is recommended, return an instance of ServerInfo with a non-null
- * non-empty String for the serverFactoryId and null for the serverInstanceId.
- * If a server instance is recommended, return an instance of ServerInfo with a non-null
- * non-empty String for the serverFactoryId and the serverInstanceId.
- */
- public ServerInfo recommendDefaultServer(IProject project);
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/JavaMerger.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/JavaMerger.java
deleted file mode 100644
index 13493b8..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/JavaMerger.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 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
- * -------- -------- -----------------------------------------------------------
- * 20070509 182274 kathy@ca.ibm.com - Kathy Chan
- * 20080122 215048 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.consumption.common;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URL;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-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.emf.codegen.merge.java.JControlModel;
-import org.eclipse.emf.codegen.merge.java.JMerger;
-import org.eclipse.emf.codegen.merge.java.facade.FacadeHelper;
-import org.eclipse.emf.codegen.util.CodeGenUtil;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-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.core.context.TransientResourceContext;
-import org.eclipse.wst.common.environment.IStatusHandler;
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-import org.eclipse.wst.ws.internal.preferences.PersistentMergeContext;
-import org.eclipse.wst.ws.internal.wsrt.IMerger;
-import org.eclipse.wst.ws.internal.wsrt.Merger;
-import org.osgi.framework.Bundle;
-
-/*
- * JavaMerger handles the merging of workspace files using JMerger. If the URIs specified is not a file
- * in the workspace, it will be ignored.
- */
-public class JavaMerger extends Merger implements IMerger {
-
- private static final String WST_WS = "org.eclipse.wst.ws";
- private static final String MERGE_XML = "merge.xml";
- private static final String JMERGER = "jmerger";
-
- private int size = 0;
- private IFile[] workspaceFiles;
- private JMerger[] mergeModels;
- private JControlModel jMergeControlModel = null;
- private IStatus loadStatus;
-
-
- /*
- * Convert the URI strings in the uris array to Eclipse IFiles and store in the workspaceFiles array.
- * Load the workspaceFiles into JMerger and store in the mergerModels array.
- * If the merger model cannot be obtained, null is stored in the mergerModels.
- * @see org.eclipse.wst.ws.internal.wsrt.IMerger#load(java.lang.String[])
- */
-
- public IStatus load(IFile[] files) {
-
- loadStatus = Status.OK_STATUS;
- if (files != null) {
- workspaceFiles = files;
- PersistentMergeContext mergeContext = WSPlugin.getInstance().getMergeContext();
- if (mergeContext.isSkeletonMergeEnabled()) {
- // initialize JMerger
- initialize();
-
- if (jMergeControlModel != null) {
- // JMerger initialized properly
- size = files.length;
- mergeModels = new JMerger[size];
-
- for (int i = 0; i < size; i++) {
- JMerger jMerger = null;
- IFile file = null;
- InputStream inStream = null;
-
- file = files[i];
- if (file != null && file.exists()) {
- try {
- inStream = file.getContents();
- if (inStream != null) {
- jMerger = new JMerger(jMergeControlModel);
- jMerger.setTargetCompilationUnit(jMerger.createCompilationUnitForInputStream(inStream));
- }
- } catch (CoreException e) {
- loadStatus = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_FILE_MERGE_LOAD, file), e);
- } finally {
- if (inStream != null) {
- try {
- inStream.close();
- } catch (IOException e) {
- // ignore exceptions in closing file
- }
- }
- }
- }
- mergeModels[i] = jMerger;
- }
- }
- }
- }
- return loadStatus;
- }
-
- /**
- * Initializes the JMerge model
- * File merge.xml in WebServicePlugin contains the rules for the merge.
- * If the merge.xml file is not found, jMergeControlModel is leave as null.
- */
- private void initialize() {
- if (jMergeControlModel == null) {
- FacadeHelper facadeHelper = CodeGenUtil.instantiateFacadeHelper(JMerger.DEFAULT_FACADE_HELPER_CLASS);
- jMergeControlModel = new JControlModel();
-
- Bundle wsBundle = Platform.getBundle(WST_WS);
- IPath mergePath = new Path( JMERGER ).append( MERGE_XML );
- URL fileURL = FileLocator.find( wsBundle, mergePath, null);
- jMergeControlModel.initialize(facadeHelper, fileURL.toString());
- }
- return;
- }
-
- /**
- * Merge the current contents of the workspaceFiles with the mergeModels that had been stored earlier.
- * Then write the merged contents back to the file.
- * @param monitor
- * @param statusHandler
- * @return IStatus
- */
- public IStatus merge(IProgressMonitor monitor, IStatusHandler statusHandler) {
-
- IStatus status = Status.OK_STATUS;
-
- if (loadStatus != null && loadStatus.getSeverity() == IStatus.ERROR) {
- return loadStatus;
- }
-
- PersistentMergeContext mergeContext = WSPlugin.getInstance().getMergeContext();
- if (mergeContext.isSkeletonMergeEnabled()) {
- ResourceContext resourceContext = new TransientResourceContext();
- resourceContext.setCheckoutFilesEnabled(true);
- resourceContext.setCreateFoldersEnabled(true);
- resourceContext.setOverwriteFilesEnabled(true);
- for (int i = 0; i < size; i++) {
- String mergedContent = null;
- JMerger jMerger = null;
- IFile file = null;
- InputStream inStream = null;
- byte[] buf = null;
-
- jMerger = mergeModels[i];
- file = workspaceFiles[i];
- if (file != null && jMerger != null && file.exists()) {
- // a JMerger model of the file exists, merge the contents
- try {
- inStream = file.getContents();
- jMerger.setSourceCompilationUnit(jMerger.createCompilationUnitForInputStream(inStream));
- jMerger.merge();
- mergedContent = jMerger.getTargetCompilationUnitContents();
- if (mergedContent != null) {
- try {
- buf = mergedContent.getBytes(file.getCharset());
- } catch (UnsupportedEncodingException e) {
- buf = mergedContent.getBytes();
- }
- inStream = new ByteArrayInputStream(buf);
- IPath targetPath = file.getLocation();
- if (targetPath != null) {
- FileResourceUtils.createFileAtLocation(resourceContext, targetPath.makeAbsolute(), inStream,
- monitor, statusHandler);
- }
- }
- } catch (CoreException e) {
- status = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_FILE_MERGE, file), e);
- } finally {
- try {
- if (inStream != null) {
- inStream.close();
- }
- } catch (IOException e) {
- // ignore exceptions in closing file
- }
- }
- }
- }
-
- }
- return status;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/JavaResourceFilter.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/JavaResourceFilter.java
deleted file mode 100644
index a84da23..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/JavaResourceFilter.java
+++ /dev/null
@@ -1,167 +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.consumption.common;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.AnyFilter;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.osgi.util.NLS;
-
-
-/**
-* This is a kind of Filter that accepts only objects
-* which indicate a Java resource. In particular, any
-* {@link org.eclipse.core.resources.IResource} whose
-* pathname, or any object whose string representation as
-* returned by <code>toString()</code>, ends in
-* "<code>.java</code>" or "<code>.class</code>" will be accepted.
-* All other objects will be rejected.
-*/
-public class JavaResourceFilter extends AnyFilter
-{
-
- /**
- * A <code>JavaResourceFilter</code> constructed with this value will
- * accept "<code>.java</code>", but not "<code>.class</code>", objects.
- */
- public static final byte JAVA_FILES = (byte)1;
-
- /**
- * A <code>JavaResourceFilter</code> constructed with this value will
- * accept "<code>.class</code>", but not "<code>.java</code>", objects.
- */
- public static final byte CLASS_FILES = (byte)2;
-
- /**
- * A <code>JavaResourceFilter</code> constructed with this value will
- * accept both "<code>.java</code>" and "<code>.class</code>" objects.
- */
- public static final byte ALL_FILES = (byte)255;
-
- private byte extensions_;
-
- /**
- * Constructs a new <code>JavaResourceFilter</code> that filters
- * "<code>.java</code>" and "<code>.class</code>" objects.
- * Equivalent to <code>JavaResourceFilter(ALL_FILES)</code>.
- */
- public JavaResourceFilter ()
- {
- this(ALL_FILES);
- }
-
- /**
- * Constructs a new <code>JavaResourceFilter</code> that filters
- * "<code>.java</code>" objects, "<code>.class</code>" objects,
- * or both if the value of <code>extensions</code> is
- * {@link #JAVA_FILES}, {@link #CLASS_FILES} or {@link #ALL_FILES}
- * respectively.
- * @param extensions One of
- * {@link #JAVA_FILES}, {@link #CLASS_FILES} or {@link #ALL_FILES}.
- */
- public JavaResourceFilter ( byte extensions )
- {
- extensions_ = extensions;
- }
-
- /**
- * Returns the locale-specific name of this filter.
- * @return The locale-specific name of this filter.
- */
- public String getName ()
- {
- return ConsumptionMessages.JAVA_FILTER_NAME;
- }
-
- /**
- * Returns the locale-specific description of this filter.
- * @return The locale-specific description of this filter.
- */
- public String getDescription ()
- {
- return ConsumptionMessages.JAVA_FILTER_DESC;
- }
-
- /**
- * Returns an {@link org.eclipse.core.runtime.IStatus}
- * describing the <code>Filter</code>'s assessment of
- * the given <code>object</code>.
- * @param object The object to filter.
- * @return An {@link org.eclipse.core.runtime.IStatus}
- * indicating whether or not if the given <code>object</code>
- * represents a Java resource.
- */
- public IStatus statusOf ( Object object )
- {
- if (object == null)
- {
- return new Status(
- IStatus.ERROR,
- WebServiceConsumptionPlugin.ID,
- 0,
- ConsumptionMessages.FILTER_MSG_ERROR_NULL_OBJECT,
- null
- );
- }
-
- String name = null;
-
- if (object instanceof IResource)
- {
- IResource resource = (IResource)object;
- name = resource.getFullPath().toString();
- if (resource.getType() != IResource.FILE)
- {
- return new Status(
- IStatus.ERROR,
- WebServiceConsumptionPlugin.ID,
- 0,
- NLS.bind(ConsumptionMessages.FILTER_MSG_ERROR_NOT_FILE,new Object[] {name}),
- null
- );
- }
- }
-
- if (name == null)
- {
- name = object.toString();
- }
-
- if (!acceptsName(name))
- {
- return new Status(
- IStatus.ERROR,
- WebServiceConsumptionPlugin.ID,
- 0,
- NLS.bind(ConsumptionMessages.JAVA_FILTER_MSG_ERROR_WRONG_EXTENSION,new Object[] {name}),
- null
- );
- }
-
- return new Status(IStatus.OK,WebServiceConsumptionPlugin.ID,0,"",null);
- }
-
- //
- // Checks if the given name is acceptable based upon its extension
- // and the value of the extensions_ bitmask.
- //
- private boolean acceptsName ( String name )
- {
- return (
- (name.endsWith(".java") && ((extensions_ & JAVA_FILES) != 0)) ||
- (name.endsWith(".class") && ((extensions_ & CLASS_FILES) != 0))
- );
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/MappingUtils.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/MappingUtils.java
deleted file mode 100644
index 13648de..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/MappingUtils.java
+++ /dev/null
@@ -1,84 +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.consumption.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-
-
-/**
-* This class contains useful methods for working with Server plugin functions
-*/
-public final class MappingUtils
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- private static final String DEFAULT_SERVICE_EXT = "Service.wsdl";
- private static final String DEFAULT_BINDING_EXT = "Binding.wsdl";
- private static final String DEFAULT_V4_SERVICE_EXT = "-service.wsdl";
- private static final String DEFAULT_V4_BINDING_EXT = "-binding.wsdl";
- private static final String WSDL_EXTENSION = ".wsdl";
- private static final String WSDL_FOLDER = "wsdl";
- public static final String DEFAULT_SKELETON_PACKAGENAME = "service";
-
- /**
- * Returns the WSDL folder path
- * @param project the project
- */
- public static IPath getWSDLFolderPath (IProject project, String componentName)
- {
- IPath wsdlFolder=null;
-// IPath webModuleServerRoot = ResourceUtils.getWebModuleServerRoot( project ).getFullPath();
- IPath webModuleServerRoot = J2EEUtils.getWebContentPath(project);
- if (webModuleServerRoot != null )
- wsdlFolder = webModuleServerRoot.append(WSDL_FOLDER);
- return wsdlFolder;
- }
-
-
- /**
- * Returns the base name based on WSDL file name
- * @param wsdlName WSDL file name
- */
- public static String getBaseName (String wsdlLocation )
- {
- String wsdlName=wsdlLocation;
-
- int index = wsdlLocation.lastIndexOf('/');
- if (index!= -1) {
- wsdlName = wsdlLocation.substring(index+1,wsdlName.length());
- }
-
- String baseName=wsdlName;
- if ( wsdlName.endsWith(DEFAULT_SERVICE_EXT) ) {
- baseName = wsdlName.substring(0,(wsdlName.length() - DEFAULT_SERVICE_EXT.length()));
- } else if ( wsdlName.toLowerCase().endsWith(DEFAULT_V4_SERVICE_EXT) ) {
- baseName = wsdlName.substring(0,(wsdlName.length() - DEFAULT_V4_SERVICE_EXT.length()));
- } else if (wsdlName.endsWith(DEFAULT_BINDING_EXT)) {
- baseName = wsdlName.substring(0,(wsdlName.length()-DEFAULT_BINDING_EXT.length()));
- } else if (wsdlName.toLowerCase().endsWith(DEFAULT_V4_BINDING_EXT)) {
- baseName = wsdlName.substring(0,(wsdlName.length()-DEFAULT_V4_BINDING_EXT.length()));
- } else if (wsdlName.toLowerCase().endsWith(WSDL_EXTENSION)) {
- baseName = wsdlName.substring(0,(wsdlName.length() - WSDL_EXTENSION.length()));
- } else {
- // no recognizable suffix, just remove extension, if any
- int index4 = baseName.lastIndexOf('.');
- if (index4!=-1)
- baseName = baseName.substring(0, index4);
- }
- return baseName;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/PropertiesResourceFilter.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/PropertiesResourceFilter.java
deleted file mode 100644
index bd679f1..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/PropertiesResourceFilter.java
+++ /dev/null
@@ -1,122 +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.consumption.common;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.AnyFilter;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.osgi.util.NLS;
-
-
-/**
-* This is a kind of Filter that accepts only objects
-* which indicate a Java resource. In particular, any
-* {@link org.eclipse.core.resources.IResource} whose
-* pathname, or any object whose string representation as
-* returned by <code>toString()</code>, ends in
-* "<code>.java</code>" or "<code>.class</code>" will be accepted.
-* All other objects will be rejected.
-*/
-public class PropertiesResourceFilter extends AnyFilter
-{
-
- /**
- * Constructs a new <code>JavaResourceFilter</code> that filters
- * "<code>.java</code>" and "<code>.class</code>" objects.
- * Equivalent to <code>JavaResourceFilter(ALL_FILES)</code>.
- */
- public PropertiesResourceFilter ()
- {
-
- }
-
- /**
- * Returns the locale-specific name of this filter.
- * @return The locale-specific name of this filter.
- */
- public String getName ()
- {
- return ConsumptionMessages.PROPERTIES_FILTER_NAME;
- }
-
- /**
- * Returns the locale-specific description of this filter.
- * @return The locale-specific description of this filter.
- */
- public String getDescription ()
- {
- return ConsumptionMessages.PROPERTIES_FILTER_DESC;
- }
-
- /**
- * Returns an {@link org.eclipse.core.runtime.IStatus}
- * describing the <code>Filter</code>'s assessment of
- * the given <code>object</code>.
- * @param object The object to filter.
- * @return An {@link org.eclipse.core.runtime.IStatus}
- * indicating whether or not if the given <code>object</code>
- * represents a Java resource.
- */
- public IStatus statusOf ( Object object )
- {
- if (object == null)
- {
- return new Status(
- IStatus.ERROR,
- WebServiceConsumptionPlugin.ID,
- 0,
- ConsumptionMessages.FILTER_MSG_ERROR_NULL_OBJECT,
- null
- );
- }
-
- String name = null;
-
- if (object instanceof IResource)
- {
- IResource resource = (IResource)object;
- name = resource.getFullPath().toString();
- if (resource.getType() != IResource.FILE)
- {
- return new Status(
- IStatus.ERROR,
- WebServiceConsumptionPlugin.ID,
- 0,
- NLS.bind(ConsumptionMessages.FILTER_MSG_ERROR_NOT_FILE,new Object[] {name}),
- null
- );
- }
- }
-
- if (name == null)
- {
- name = object.toString();
- }
-
- if (!name.endsWith(".properties"))
- {
- return new Status(
- IStatus.ERROR,
- WebServiceConsumptionPlugin.ID,
- 0,
- NLS.bind(ConsumptionMessages.PROPERTIES_FILTER_MSG_ERROR_WRONG_EXTENSION,new Object[] {name}),
- null
- );
- }
-
- return new Status(IStatus.OK,WebServiceConsumptionPlugin.ID,0,"",null);
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/RequiredFacetVersion.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/RequiredFacetVersion.java
deleted file mode 100644
index 08d2aa9..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/RequiredFacetVersion.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
- * -------- -------- -----------------------------------------------------------
- * 20060131 121071 rsinha@ca.ibm.com - Rupam Kuehner
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.common;
-
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public class RequiredFacetVersion
-{
- private IProjectFacetVersion projectFacetVersion;
- private boolean allowNewer;
- private IProjectFacetVersion[] allowedProjectFacetVersions;
-
- public boolean getAllowNewer()
- {
- return allowNewer;
- }
- public void setAllowNewer(boolean allowNewer)
- {
- this.allowNewer = allowNewer;
- }
- public IProjectFacetVersion getProjectFacetVersion()
- {
- return projectFacetVersion;
- }
- public void setProjectFacetVersion(IProjectFacetVersion projectFacetVersion)
- {
- this.projectFacetVersion = projectFacetVersion;
- }
- public IProjectFacetVersion[] getAllowedProjectFacetVersions()
- {
- if (allowedProjectFacetVersions == null)
- {
- ArrayList versions = new ArrayList();
- IProjectFacetVersion minpfv = getProjectFacetVersion();
- versions.add(minpfv);
- //If allow-newer is true, add all the versions greater than the min version.
- if (getAllowNewer())
- {
- String minVersion = minpfv.getVersionString();
- Iterator allVersionsItr = minpfv.getProjectFacet().getVersions().iterator();
- while (allVersionsItr.hasNext())
- {
- IProjectFacetVersion testpfv = (IProjectFacetVersion)allVersionsItr.next();
- String testVersion = testpfv.getVersionString();
- if (FacetUtils.greaterThan(testVersion, minVersion))
- {
- versions.add(testpfv);
- }
- }
- }
-
- allowedProjectFacetVersions = (IProjectFacetVersion[])versions.toArray(new IProjectFacetVersion[0]);
- }
-
- return allowedProjectFacetVersions;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/ServerInfo.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/ServerInfo.java
deleted file mode 100644
index 0625cb2..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/ServerInfo.java
+++ /dev/null
@@ -1,54 +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
- *******************************************************************************/
-/*
- * Created on Mar 25, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.ws.internal.consumption.common;
-
-/**
- *
- */
-public class ServerInfo
-{
- String serverFactoryId;
- String serverInstanceId;
- /**
- * @return Returns the serverFactoryId.
- */
- public String getServerFactoryId()
- {
- return serverFactoryId;
- }
- /**
- * @param serverFactoryId The serverFactoryId to set.
- */
- public void setServerFactoryId(String serverFactoryId)
- {
- this.serverFactoryId = serverFactoryId;
- }
- /**
- * @return Returns the serverInstanceId.
- */
- public String getServerInstanceId()
- {
- return serverInstanceId;
- }
- /**
- * @param serverInstanceId The serverInstanceId to set.
- */
- public void setServerInstanceId(String serverInstanceId)
- {
- this.serverInstanceId = serverInstanceId;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLParserFactory.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLParserFactory.java
deleted file mode 100644
index a6dd181..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLParserFactory.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.common;
-
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-/**
- *
- * The factory class can be used to get at a single instance of the
- * WSDL parser. Note: This class is temporary. We will probably come
- * up with a better method of handling passing around the parser.
- *
- */
-//TODO We need to find a better way to pass around the parser than
-// using this singleton factory. Hopefully, we can then delete
-// this class.
-public class WSDLParserFactory
-{
- private static WebServicesParserExt parser_;
-
- private WSDLParserFactory()
- {
- }
-
- public static WebServicesParser getWSDLParser()
- {
- if( parser_ == null )
- {
- parser_ = new WebServicesParserExt();
- }
-
- return parser_;
- }
-
- public static void killParser()
- {
- parser_ = null;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLResourceFilter.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLResourceFilter.java
deleted file mode 100644
index 33d3726..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLResourceFilter.java
+++ /dev/null
@@ -1,117 +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.consumption.common;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.AnyFilter;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.osgi.util.NLS;
-
-
-/**
-* This is a kind of Filter that accepts only objects
-* which indicate a WSDL resource. In particular, any
-* {@link org.eclipse.core.resources.IResource} whose
-* pathname, or any object whose string representation as
-* returned by <code>toString()</code>, ends in
-* "<code>.wsdl</code>" will be accepted.
-* All other objects will be rejected.
-*/
-public class WSDLResourceFilter extends AnyFilter
-{
- /**
- * Constructs a new <code>WSDLResourceFilter</code>.
- */
- public WSDLResourceFilter ()
- {
- }
-
- /**
- * Returns the locale-specific name of this filter.
- * @return The locale-specific name of this filter.
- */
- public String getName ()
- {
- return ConsumptionMessages.WSDL_FILTER_NAME;
- }
-
- /**
- * Returns the locale-specific description of this filter.
- * @return The locale-specific description of this filter.
- */
- public String getDescription ()
- {
- return ConsumptionMessages.WSDL_FILTER_DESC;
- }
-
- /**
- * Returns an {@link org.eclipse.core.runtime.IStatus}
- * describing the <code>Filter</code>'s assessment of
- * the given <code>object</code>.
- * @param object The object to filter.
- * @return An {@link org.eclipse.core.runtime.IStatus}
- * indicating whether or not if the given <code>object</code>
- * represents a WSDL resource.
- */
- public IStatus statusOf ( Object object )
- {
- if (object == null)
- {
- return new Status(
- IStatus.ERROR,
- WebServiceConsumptionPlugin.ID,
- 0,
- ConsumptionMessages.FILTER_MSG_ERROR_NULL_OBJECT,
- null
- );
- }
-
- String name = null;
-
- if (object instanceof IResource)
- {
- IResource resource = (IResource)object;
- name = resource.getFullPath().toString();
- if (resource.getType() != IResource.FILE)
- {
- return new Status(
- IStatus.ERROR,
- WebServiceConsumptionPlugin.ID,
- 0,
- NLS.bind(ConsumptionMessages.FILTER_MSG_ERROR_NOT_FILE,new Object[] {name}),
- null
- );
- }
- }
-
- if (name == null)
- {
- name = object.toString();
- }
-
- if (!name.endsWith(".wsdl"))
- {
- return new Status(
- IStatus.ERROR,
- WebServiceConsumptionPlugin.ID,
- 0,
- NLS.bind(ConsumptionMessages.WSDL_FILTER_MSG_ERROR_WRONG_EXTENSION,new Object[] {name}),
- null
- );
- }
-
- return new Status(IStatus.OK,WebServiceConsumptionPlugin.ID,0,"",null);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WebServiceStartServerRegistry.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WebServiceStartServerRegistry.java
deleted file mode 100644
index 8b05856..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WebServiceStartServerRegistry.java
+++ /dev/null
@@ -1,100 +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.consumption.common;
-
-import java.util.Hashtable;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.ILog;
-
-
-
-/**
-* This is the registry of WebServiceStartServerType objects.
-*/
-public class WebServiceStartServerRegistry
-{
-
- private static WebServiceStartServerRegistry instance_;
- private Hashtable StartServerTypes;
-
- //
- // Loads WebServiceStartServerType objects into this registry.
- // See method getInstance().
- //
- private void load ()
- {
- StartServerTypes = new Hashtable();
- IExtensionRegistry reg = Platform.getExtensionRegistry();
- IConfigurationElement[] config = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption",
- "webServiceStartServerType");
-
- for(int idx=0; idx<config.length; idx++)
- {
- IConfigurationElement elem = config[idx];
- try
- {
- String factoryId_ = elem.getAttribute("factoryId");
- StartServerTypes.put(factoryId_, elem);
-
- }
- catch (Exception e)
- {
- ILog log = EnvironmentService.getEclipseLog();
- log.log(ILog.ERROR, 5047, this, "load", e);
- }
-
- }
- }
-
- /**
- * Returns a singleton instance of this class.
- * @return A singleton WebServiceStartServerRegistry object.
- */
- public static WebServiceStartServerRegistry getInstance ()
- {
- if (instance_ == null)
- {
- instance_ = new WebServiceStartServerRegistry();
- instance_.load();
- }
- return instance_;
- }
-
- public Object getServerStartByTypeId (String typeID) throws CoreException
- {
- if (typeID==null)
- return null;
- return ((IConfigurationElement)StartServerTypes.get(typeID)).createExecutableExtension("class");
- }
-
- public boolean isRemoveEARRequired(String typeId) throws CoreException {
- if (typeId!=null) {
- IConfigurationElement elem = (IConfigurationElement)StartServerTypes.get(typeId);
- if (elem!=null){
- String value = elem.getAttribute("removeEAR");
- if (value!=null){
- return Boolean.valueOf(value).booleanValue();
- }
- }
- }
- return true;
- }
-}
-
-
-
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ArrayElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ArrayElement.java
deleted file mode 100644
index 03db954..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ArrayElement.java
+++ /dev/null
@@ -1,99 +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.consumption.datamodel.beanmodel;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicModel;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-/**
-* Objects of this class represent a Java bean.
-* Nearest moral equivalents: java.lang.Class, java.beans.BeanDescriptor.
-*/
-public class ArrayElement extends TypeElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- public static String ARRAY_NAME = "10101010array10101010";
- public static String REL_METHODS = "relmethods";
-
- /**
- * Constructor
- * @param projectElement The project this Bean belongs to.
- */
- public ArrayElement (String name)
- {
- this(name,new BasicModel("Project"),true);
- }
-
- /**
- * Constructor
- * @param parameterElement The parameter this Bean belongs to.
- */
- public ArrayElement (String name, Model model,boolean isRoot)
- {
- super(name,model,TypeElement.ARRAY);
- if(isRoot) model.setRootElement(this);
- fOwnerType = TypeElement.ROOT;
- }
-
-
- /**
- * Constructor for the case when this is not the root object
- * here it represents complex types
- * @param ParameterElement The Parameter that owns this bean type.
- * @param String Name of the bean element.
- */
- public ArrayElement ( ParameterElement parameterElement, String name)
- {
- super(name,parameterElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.ARRAY);
- fOwnerType = TypeElement.PARAMETER_OWNER;
- }
-
- /**
- * Constructor for the case when this is not the root object
- * here it represents complex types
- * @param ParameterElement The Parameter that owns this bean type.
- * @param String Name of the ParameterElement.
- */
- public ArrayElement ( AttributeElement attributeElement, String name)
- {
- super(name,attributeElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.ARRAY);
- fOwnerType = TypeElement.ATTRIBUTE_OWNER;
- }
-
- /**
- * Constructor for the case when this is not the root object
- * here it represents complex types
- * @param FieldElement The Parameter that owns this bean type.
- * @param String Name of the ParameterElement.
- */
- public ArrayElement ( FieldElement fieldElement, String name)
- {
- super(name,fieldElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.ARRAY);
- fOwnerType = TypeElement.FIELD_OWNER;
- }
-
-
- /*
- * determine wether this is an object array or
- * primitive array
- */
- public String getTypeName()
- {
- return ARRAY_NAME + getName();
- }
-
-
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ArrayType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ArrayType.java
deleted file mode 100644
index a125104..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ArrayType.java
+++ /dev/null
@@ -1,68 +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
- * -------- -------- -----------------------------------------------------------
- * 20071122 210692 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* objects of this class represent a recognized return type
-*
-*/
-public class ArrayType extends RecognizedReturnType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public ArrayType(String typeName)
- {
- this(TypeFactory.ARRAY_NAME,typeName);
- }
-
- public ArrayType(String name,String typeName)
- {
- super(name);
- }
-
-
- /**
- * This is basically the function that dictates how we want to display this type
- * upon receiving it as a return from a proxy method
- * @param String the name of the type
- * @return String The display string
- */
- public String TypeConversion(String name)
- {
-
- String nonBean = Generator.DOUBLE_TAB + "String temp"+ getUniqueName() + " = null;" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "if(" + name + " != null){" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "java.util.List list" + getUniqueName() + "= java.util.Arrays.asList(" + name + ");" +StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "temp"+ getUniqueName() +" = list" + getUniqueName() + ".toString();" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "}" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%=temp"+ getUniqueName() +"%>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%"+ StringUtils.NEWLINE;
-
- return nonBean;
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/AttributeElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/AttributeElement.java
deleted file mode 100644
index 137cf71..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/AttributeElement.java
+++ /dev/null
@@ -1,95 +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.consumption.datamodel.beanmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-/**
-* Objects of this class represent a Java bean method parameter.
-* Nearest moral equivalents: java.beans.ParameterDescriptor.
-*/
-public class AttributeElement extends BasicElement implements AttributeElementType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static final String REL_TYPE = "type";
- public static final String REL_OWNING_BEAN = "owningbean";
-
- private String fSetterMethod;
- private String fGetterMethod;
-
- /**
- * Constructor this takes the owning bean.
- * @param name The name of the attribute.
- * @param beanElement the bean that owns this attribute.
- */
- public AttributeElement ( BeanElement beanElement, String name)
- {
- super(name,beanElement,REL_OWNING_BEAN,BeanElement.REL_ATTRIBUTES);
- }
-
- public void setSetterMethod(String setterMethod)
- {
- fSetterMethod = setterMethod;
- }
-
- public String getSetterMethod()
- {
- return fSetterMethod;
- }
-
- public String getGetterMethod()
- {
- return fGetterMethod;
- }
-
- public void setGetterMethod(String getterMethod)
- {
- fGetterMethod = getterMethod;
- }
-
- public String getSetterSignature(String attribute)
- {
- int bracket = fSetterMethod.indexOf("(");
- bracket++;
- String setter = fSetterMethod.substring(0,bracket);
- String fullSetter = setter + attribute + ");";
-
- return fullSetter;
- }
-
- /**
- * Returns the Bean that owns this Attribute.
- * @return BeanElement The bean that owns this attribute.
- */
- public BeanElement getOwningBeanElement ()
- {
- Enumeration e = getElements(REL_OWNING_BEAN);
- return e.hasMoreElements() ? (BeanElement)e.nextElement() : null;
- }
-
- /**
- * Returns the type that is owned by this attributte.
- * @return TypeElement The Type that of this attribute.
- */
- public TypeElement getTypeElement ()
- {
- Enumeration e = getElements(REL_TYPE);
- return e.hasMoreElements() ? (TypeElement)e.nextElement() : null;
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/AttributeElementType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/AttributeElementType.java
deleted file mode 100644
index 0b0b6fc..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/AttributeElementType.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* Objects of this class represent a Java bean method parameter.
-* Nearest moral equivalents: java.beans.ParameterDescriptor.
-*/
-public interface AttributeElementType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public void setSetterMethod(String setterMethod);
- public String getSetterMethod();
- public String getGetterMethod();
- public void setGetterMethod(String getterMethod);
- public BeanElement getOwningBeanElement ();
- public TypeElement getTypeElement ();
- /**
- * Return the signature with this value as the parmeter
- *
- */
- public String getSetterSignature(String attribute);
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BeanElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BeanElement.java
deleted file mode 100644
index 79c9d0d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BeanElement.java
+++ /dev/null
@@ -1,147 +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
- * -------- -------- -----------------------------------------------------------
- * 20060612 145433 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicModel;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-
-/**
-* Objects of this class represent a Java bean.
-* Nearest moral equivalents: java.lang.Class, java.beans.BeanDescriptor.
-*/
-public class BeanElement extends TypeElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- public static String STATELESS_BEAN = "10101010statelessbean10101010";
- public static String REL_METHODS = "relmethods";
- public static int READONLY = 0;
- public static int WRITEONLY = 1;
- public static int READWRITE = 2;
- private int attrib = 2;
-
-
- /**
- * Constructor
- * @param projectElement The project this Bean belongs to.
- */
- public BeanElement (String name)
- {
- this(name,new BasicModel("Project"),true);
- }
-
- /**
- * Constructor
- * @param parameterElement The parameter this Bean belongs to.
- */
- public BeanElement (String name, Model model,boolean isRoot)
- {
- super(name,model,TypeElement.BEAN);
- if(isRoot) model.setRootElement(this);
- fOwnerType = TypeElement.ROOT;
- }
-
- /**
- * Constructor for the case when this is not the root object
- * here it represents complex types
- * @param ParameterElement The Parameter that owns this bean type.
- * @param String Name of the bean element.
- */
- public BeanElement ( ParameterElement parameterElement, String name)
- {
- super(name,parameterElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.BEAN);
- fOwnerType = TypeElement.PARAMETER_OWNER;
- }
-
- /**
- * Constructor for the case when this is not the root object
- * here it represents complex types
- * @param ParameterElement The Parameter that owns this bean type.
- * @param String Name of the ParameterElement.
- */
- public BeanElement ( AttributeElement attributeElement, String name)
- {
- super(name,attributeElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.BEAN);
- fOwnerType = TypeElement.ATTRIBUTE_OWNER;
- attribFunction(attributeElement);
- }
-
- private void attribFunction(AttributeElement attributeElement){
- if(attributeElement.getGetterMethod() != null && attributeElement.getSetterMethod() != null) attrib = READWRITE;
- else if(attributeElement.getGetterMethod() == null && attributeElement.getSetterMethod() != null) attrib = WRITEONLY;
- else if(attributeElement.getGetterMethod() != null && attributeElement.getSetterMethod() == null) attrib = READONLY;
- }
-
- /**
- * Constructor for the case when this is not the root object
- * here it represents complex types
- * @param ParameterElement The Parameter that owns this bean type.
- * @param String Name of the ParameterElement.
- */
- public BeanElement ( FieldElement fieldElement, String name)
- {
- super(name,fieldElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.BEAN);
- fOwnerType = TypeElement.FIELD_OWNER;
-
- }
-
- /**
- * Returns an enumeration of all Method objects of this Bean.
- * @return Enumeration All Method objects of this Bean.
- */
- public Enumeration getMethods ()
- {
- return getElements(REL_METHODS);
- }
-
- /**
- * Returns the number of Method objects of this Bean.
- * @return int The number of Method objects of this Bean.
- */
- public int getNumberOfMethodElements ()
- {
- return getNumberOfElements(REL_METHODS);
- }
-
- public String getTypeName()
- {
- if(isStateLess()) return STATELESS_BEAN + getName();
- return getName();
- }
-
- public int getAttrib()
- {
- return attrib;
- }
-
- public void setAttrib(int attrib)
- {
- this.attrib = attrib;
- }
-
- public boolean isStateLess()
- {
- Enumeration ea = getElements(TypeElement.REL_ATTRIBUTES);
- Enumeration ef = getElements(TypeElement.REL_FIELDS);
- if(ea.hasMoreElements() || ef.hasMoreElements()) return false;
- else return true;
- }
-
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BeanModelElementsFactory.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BeanModelElementsFactory.java
deleted file mode 100644
index 174d6af..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BeanModelElementsFactory.java
+++ /dev/null
@@ -1,168 +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.consumption.datamodel.beanmodel;
-
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.common.SamplePropertyDescriptor;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-/**
- * TypeFactory
- * Creation date: (4/10/2001 12:41:48 PM)
- * @author: Gilbert Andrews
- */
-public class BeanModelElementsFactory
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- public static final String RETURN_PARAM_NAME="returnp";
-
- private BeanModelElementsFactory(){}
-
- public static Element getBeanModelElement(Object object)
- {
- return BeanModelElementsFactory.getBeanModelElement(object,null,null);
- }
-
- public static Element getBeanModelElement(Object object,Element parentElement)
- {
- return BeanModelElementsFactory.getBeanModelElement(object,parentElement,null);
- }
-
- /*
- * Take in an object and return an element depending on what
- * type we are dealing with from the javamof
- **/
- public static Element getBeanModelElement(Object object,Element parentElement, Model model)
- {
- Element returnElement = null;
-
- if (object instanceof JavaClass){
- JavaClass javaClass = (JavaClass)object;
- String javaName = javaClass.getJavaName();
- if (!javaClass.isArray()){
- if(parentElement == null && model ==null) returnElement = new BeanElement(javaName);
- else if(parentElement == null && model !=null) returnElement = new BeanElement(javaName,model,false);
- else{
- if(parentElement instanceof ParameterElement){
- ParameterElement tempElement = (ParameterElement)parentElement;
- returnElement = new BeanElement(tempElement,javaName);
- }
- else if(parentElement instanceof AttributeElement){
- AttributeElement tempElement = (AttributeElement)parentElement;
- returnElement = new BeanElement(tempElement,javaName);
- }
- else if(parentElement instanceof FieldElement){
- FieldElement tempElement = (FieldElement)parentElement;
- returnElement = new BeanElement(tempElement,javaName);
- }
- else if(parentElement instanceof MethodElement){
- returnElement = new ParameterElement((MethodElement)parentElement,RETURN_PARAM_NAME,MethodElement.REL_RETURN_PARAMETERS,true);
- }
- }
- }
- else{
- if(parentElement == null && model ==null) returnElement = new ArrayElement(javaName);
- else if(parentElement == null && model !=null) returnElement = new ArrayElement(javaName,model,false);
- else{
- if(parentElement instanceof ParameterElement){
- ParameterElement tempElement = (ParameterElement)parentElement;
- returnElement = new ArrayElement(tempElement,javaName);
- }
- else if(parentElement instanceof AttributeElement){
- AttributeElement tempElement = (AttributeElement)parentElement;
- returnElement = new ArrayElement(tempElement,javaName);
- }
- else if(parentElement instanceof FieldElement){
- FieldElement tempElement = (FieldElement)parentElement;
- returnElement = new ArrayElement(tempElement,javaName);
- }
- else if(parentElement instanceof MethodElement){
- returnElement = new ParameterElement((MethodElement)parentElement,RETURN_PARAM_NAME,MethodElement.REL_RETURN_PARAMETERS,true);
- }
-
- }
- }
-
- }
- else if(object instanceof SamplePropertyDescriptor){
- SamplePropertyDescriptor pd = (SamplePropertyDescriptor)object;
- returnElement = new AttributeElement((BeanElement)parentElement,pd.getName());
- }
- else if(object instanceof Field){
- Field field = (Field)object;
- returnElement = new FieldElement((BeanElement)parentElement,field.getName());
- }
- else if (object instanceof Method){
- Method method = (Method)object;
- returnElement = new MethodElement((BeanElement)parentElement,method.getName(), method.getMethodElementSignature());
- }
- //non beaninfo
- else if (object instanceof String){
- String name = (String)object;
- returnElement = new AttributeElement((BeanElement)parentElement,name);
- }
- else if (object instanceof JavaParameter){
- JavaParameter javaParameter = (JavaParameter)object;
-
-
- if (javaParameter.isReturn())
- returnElement = new ParameterElement((MethodElement)parentElement,RETURN_PARAM_NAME,MethodElement.REL_RETURN_PARAMETERS,true);
- else{
- //a java parameter gives us the qualified name we dont want this
- String name = javaParameter.getQualifiedName();
- String shortName;
- int index = name.lastIndexOf(".");
- if (index != -1){
- index++;
- shortName = name.substring(index);
- }
- else shortName = name;
-
- returnElement = new ParameterElement((MethodElement)parentElement,shortName,MethodElement.REL_PARAMETERS,false);
-
- }
-
- }
- else if (object instanceof JavaHelpers){
- JavaHelpers javaHelper = (JavaHelpers)object;
- String javaName;
- if (javaHelper.isArray()) javaName = TypeFactory.ARRAY_NAME;
- else javaName = javaHelper.getJavaName();
- if (parentElement instanceof ParameterElement){
- returnElement = new SimpleElement((ParameterElement)parentElement,javaName,javaHelper.isPrimitive());
- }
- else if(parentElement instanceof AttributeElement){
- returnElement = new SimpleElement((AttributeElement)parentElement,javaName,javaHelper.isPrimitive());
- }
- else if(parentElement instanceof FieldElement){
- returnElement = new SimpleElement((FieldElement)parentElement,javaName,javaHelper.isPrimitive());
- }
- else if(parentElement instanceof MethodElement){
- returnElement = new ParameterElement((MethodElement)parentElement,RETURN_PARAM_NAME,MethodElement.REL_RETURN_PARAMETERS,true);
- }
- }
- return returnElement;
- }
-
-
-
-
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BigDecimalType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BigDecimalType.java
deleted file mode 100644
index 24da0c1..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BigDecimalType.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-/**
-* objects of this class represent a type
-*
-*/
-public class BigDecimalType extends SimpleType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public BigDecimalType()
- {
- super(TypeFactory.BIG_DECIMAL_NAME);
- }
-
- /**
- * StringToType gets the string taken by the
- * user into proxy form
- * @return String convert the string to type .
- */
- public String StringToType(String name)
- {
- return "new java.math.BigDecimal(" + name + ");";
- }
-
- /**
- * The stringConversion function nails out specific conversion methods used among simple types
- * This method is to be implemented by SimpleType subclasses
- * @param String the name of string after the request call
- * @return String the actual conversion string containing the name.
- */
- public String TypeToString(String name)
- {
- return name + ".toString()";
- }
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BigIntegerType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BigIntegerType.java
deleted file mode 100644
index acf6033..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BigIntegerType.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-/**
-* objects of this class represent a type
-*
-*/
-public class BigIntegerType extends SimpleType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public BigIntegerType()
- {
- super(TypeFactory.BIG_INTEGER_NAME);
- }
-
- /**
- * StringToType gets the string taken by the
- * user into proxy form
- * @return String convert the string to type .
- */
- public String StringToType(String name)
- {
- return "new java.math.BigInteger(" + name + ");";
- }
-
- /**
- * The stringConversion function nails out specific conversion methods used among simple types
- * This method is to be implemented by SimpleType subclasses
- * @param String the name of string after the request call
- * @return String the actual conversion string containing the name.
- */
- public String TypeToString(String name)
- {
- return name + ".toString()";
- }
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DataType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DataType.java
deleted file mode 100644
index 4861a69..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DataType.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-* This class is used to simplify the codegen process
-* Because codegen may be processed differently depending on the type
-* we can handle how each type wants the code to look for a specific task
-* by creating a datatype and calling generic methods that are
-* to be specialized in subclasses
-*/
-public interface DataType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static String REL_TYPE = "type";
-
- /**
- * This function hands back the code required to go from the
- * string the user entered to the actual type of the element
- * @param String typeName this is the actual name of the type ie int,boolean
- * @param String nodeName The nodeName is just the attributename + Temp.
- * @param String the attributeName
- * @return String convert the string to type .
- */
- public String stringConversion(String typeName, String nodeName, String attributeName);
-
- /**
- * Often times in order to convert a type to string, string to type or just plain provide an input form
- * A temporary variable is used. If we run into a sitution where two of the same types are used in the
- * same method these temporary variables share the same name space. It isnt enough to use a name
- * because of we may have a nested scenario. Therefore any temporary variable that is used in a dataType
- * must use a unique name apeended to the end. This name must be passed in and it is up to the user of
- * DataType to insure it is unique.
- * @return Unique Name
- */
- public void setUniqueName(String name);
-
- /**
- * This is the name each temp variable will use
- *
- *
- */
- public String getUniqueName();
-
- /**
- * This function dictates how you want to process the
- * incoming string from the input jsp. You may or may not use the markup
- * function depending on the type. The simple types use it. DomElement does not
- * @param String the name of the attribute
- * @return String the code to be generated
- */
- public String getRequestCode(String name, String id);
-
-
- /**
- * Input form returns the user input html
- * @param String name The name of the input element
- * @return String The form used to collect the data
- */
- public String inputForm(String name);
-
- /**
- * converts the type returned from the proxy
- * back to a string
- * @return String convert the type to string.
- */
- public String TypeConversion(String name);
-
- /**
- * return the type
- * @return String the type(including package).
- */
- public String getType();
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DateType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DateType.java
deleted file mode 100644
index 95a9c44..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DateType.java
+++ /dev/null
@@ -1,128 +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
- * -------- -------- -----------------------------------------------------------
- * 20071110 209087 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* objects of this class represent a type
-*
-*/
-public class DateType extends SimpleType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public DateType()
- {
- super(TypeFactory.BIG_DECIMAL_NAME);
- }
-
-
- /**
- * inputForm returns the user input html
- * The simple form is just a text input box
- * This has been specialized to show an example
- * @param String name The name of the input element
- * @return String The form used to collect the data
- */
- public String inputForm(String name)
- {
- String inputForm = "<TD ALIGN=\"left\"><INPUT TYPE=\"TEXT\" NAME=\""
- + name + "\" SIZE=20></TD>" + StringUtils.NEWLINE
- + "<%" + StringUtils.NEWLINE
- + "java.text.DateFormat dateFormat" + getUniqueName()+ " = java.text.DateFormat.getDateInstance();" + StringUtils.NEWLINE
- + "java.util.GregorianCalendar gcExamp" + getUniqueName()+ " = new java.util.GregorianCalendar();" + StringUtils.NEWLINE
- + "java.util.Date date" + getUniqueName()+ " = gcExamp" + getUniqueName()+ ".getTime();" + StringUtils.NEWLINE
- + "String tempResult" + getUniqueName()+ " = dateFormat" + getUniqueName()+ ".format(date" + getUniqueName()+ ");" + StringUtils.NEWLINE
- + "%>" + StringUtils.NEWLINE
- + "<TD ALIGN=\"left\">" + StringUtils.NEWLINE
- + "</TR>" + StringUtils.NEWLINE
- + "<TR>" + StringUtils.NEWLINE
- + "<TD> </TD>" + StringUtils.NEWLINE
- + "<TD ALIGN=\"left\"> eg. <%= tempResult" + getUniqueName()+ " %> </TD>" + StringUtils.NEWLINE
- + "</TR>" + StringUtils.NEWLINE;
-
-
-
- return inputForm;
- }
-
-
- /*
- * This function needs to be specialized
- * We must use the date function to help
- * us convert back and forth
- */
- public String stringConversion(String typeName, String nodeName, String attributeName)
- {
- String conversion = Generator.DOUBLE_TAB + "java.text.DateFormat dateFormat" + getUniqueName()+ " = java.text.DateFormat.getDateInstance();"
- + StringUtils.NEWLINE + Generator.DOUBLE_TAB + nodeName + "= dateFormat" + getUniqueName()+ ".parse(" + attributeName + ");"
- + "" + StringUtils.NEWLINE;
- return conversion;
- }
-
- /**
- * this is needed for most case
- * but it is peripheral as the stringconversion needed
- * to be overridden
- */
- public String StringToType(String name)
- {
- return "";
- }
-
-
-
- /**
- * converts the type returned from the proxy
- * back to a string
- * @return String convert the type to string.
- */
- public String TypeConversion(String name)
- {
-
- String conversion = Generator.DOUBLE_TAB + "java.text.DateFormat dateFormat" + getUniqueName()+ " = java.text.DateFormat.getDateInstance();" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "String tempResult" + getUniqueName()+ " = org.eclipse.jst.ws.util.JspUtils.markup(dateFormat" + getUniqueName()+ ".format(" + name +"));" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%= tempResult" + getUniqueName()+ " %>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%" + StringUtils.NEWLINE;
-
- return conversion;
- }
-
-
-
- /**
- * The stringConversion function nails out specific conversion methods used among simple types
- * This method is to be implemented by SimpleType subclasses
- * @param String the name of string after the request call
- * @return String the actual conversion string containing the name.
- */
- public String TypeToString(String name)
- {
- return "";
- }
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DomElementType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DomElementType.java
deleted file mode 100644
index 33e0cef..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DomElementType.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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
- * -------- -------- -----------------------------------------------------------
- * 20090917 289800 mahutch@ca.ibm.com - Mark Hutchinson, SOAPElement or Element parameters result in compile errors in sample
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* objects of this class represent a type
-*
-*/
-public class DomElementType implements DataType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- protected String fType;
- protected String fUniqueName;
-
- /**
- *Constructor
- *
- */
- public DomElementType()
- {
- fType = "org.w3c.dom.Element";
- fUniqueName = "";
- }
-
- /**
- * inputForm returns the user input html
- * The DomElement form is a text box
- * @param String name The name of the input element
- * @return String The form used to collect the data
- */
- public String inputForm(String name)
- {
- String inputForm = "<TD ALIGN=\"left\"><TEXTAREA Rows=7 Cols=45 NAME=\""
- + name + "\"></TEXTAREA></TD>" + StringUtils.NEWLINE
- + "</TR>" + StringUtils.NEWLINE;
- return inputForm;
- }
-
- /**
- * This function dictates how you want to process the
- * incoming string from the input jsp. You may or may not use the markup
- * function depending on the type. The simple types use it. DomElement does not
- * @param String the name of the attribute
- * @return String the code to be generated
- */
- public String getRequestCode(String name, String id)
- {
- String requestCode = Generator.DOUBLE_TAB + "String" + Generator.SPACE
- + id + "= request.getParameter(\""
- + name +"\");" + StringUtils.NEWLINE;
- return requestCode;
- }
-
- /**
- * This function hands back the code required to go from the
- * string the user entered to the actual type of the element
- * @param String typeName this is the actual name of the type ie int,boolean
- * @param String nodeName The nodeName is just the attributename + Temp.
- * @param String the attributeName
- * @return String convert the string to type .
- */
- public String stringConversion(String typeName, String nodeName, String attributeName)
- {
-
- String conversion = Generator.DOUBLE_TAB
- + nodeName + "= org.eclipse.jst.ws.util.DomElementHelper.createDomElementFromXMLString(" + attributeName + ");"
- + StringUtils.NEWLINE;
- return conversion;
- }
-
- /**
- * This is basically the function that dictates how we want to display this type
- * upon receiving it as a return from a proxy method
- * @param String the name of the type
- * @return String The display string
- */
- public String TypeConversion(String name)
- {
- String typeToString = Generator.DOUBLE_TAB + "String tempResult" + getUniqueName()+ " = org.eclipse.jst.ws.util.DomElementHelper.domWriter(" + name + ", new java.lang.StringBuffer()" + ");" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%= tempResult" + getUniqueName()+ " %>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%" + StringUtils.NEWLINE;
-
- return typeToString;
- }
-
- /**
- * return the name of this type
- * @return String the name(including package).
- */
- public String getType()
- {
- return fType;
- }
-
- public String getUniqueName()
- {
- return fUniqueName;
- }
-
- public void setUniqueName(String name)
- {
- fUniqueName = name;
- }
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/FieldElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/FieldElement.java
deleted file mode 100644
index 44fbb1d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/FieldElement.java
+++ /dev/null
@@ -1,92 +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.consumption.datamodel.beanmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-/**
-* Objects of this class represent a Java bean method parameter.
-* Nearest moral equivalents: java.beans.ParameterDescriptor.
-*/
-public class FieldElement extends BasicElement implements AttributeElementType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- private String fSetterMethod;
- private String fGetterMethod;
-
-
- public static final String REL_TYPE = "type";
- public static final String REL_OWNING_BEAN = "owningbean";
-
- /**
- * Constructor this takes the owning bean.
- * @param name The name of the attribute.
- * @param beanElement the bean that owns this attribute.
- */
- public FieldElement ( BeanElement beanElement, String name)
- {
- super(name,beanElement,REL_OWNING_BEAN,BeanElement.REL_FIELDS);
- fSetterMethod = name;
- fGetterMethod = name;
- }
-
- public void setSetterMethod(String setterMethod)
- {
- fSetterMethod = setterMethod;
- }
-
- public String getSetterMethod()
- {
- return fSetterMethod;
- }
-
- public String getGetterMethod()
- {
- return fGetterMethod;
- }
-
- public void setGetterMethod(String getterMethod)
- {
- fGetterMethod = getterMethod;
- }
-
- public String getSetterSignature(String attribute)
- {
- return fSetterMethod + " = " + attribute + ";";
- }
-
- /**
- * Returns the Bean that owns this Attribute.
- * @return BeanElement The bean that owns this attribute.
- */
- public BeanElement getOwningBeanElement ()
- {
- Enumeration e = getElements(REL_OWNING_BEAN);
- return e.hasMoreElements() ? (BeanElement)e.nextElement() : null;
- }
-
- /**
- * Returns the type that is owned by this attributte.
- * @return TypeElement The Type that of this attribute.
- */
- public TypeElement getTypeElement ()
- {
- Enumeration e = getElements(REL_TYPE);
- return e.hasMoreElements() ? (TypeElement)e.nextElement() : null;
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/GregorianCalendarType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/GregorianCalendarType.java
deleted file mode 100644
index 3a9d9d1..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/GregorianCalendarType.java
+++ /dev/null
@@ -1,130 +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
- * -------- -------- -----------------------------------------------------------
- * 20071110 209087 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-/**
-* objects of this class represent a type
-*
-*/
-public class GregorianCalendarType extends SimpleType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public GregorianCalendarType()
- {
- super(TypeFactory.GREGORIAN_CALENDAR_NAME);
- }
-
-
- /**
- * inputForm returns the user input html
- * The simple form is just a text input box
- * This has been specialized to show an example
- * @param String name The name of the input element
- * @return String The form used to collect the data
- */
- public String inputForm(String name)
- {
- String inputForm = "<TD ALIGN=\"left\"><INPUT TYPE=\"TEXT\" NAME=\""
- + name + "\" SIZE=20></TD>" + StringUtils.NEWLINE
- + "<%" + StringUtils.NEWLINE
- + "java.text.DateFormat dateFormat" + getUniqueName()+ " = java.text.DateFormat.getDateInstance();" + StringUtils.NEWLINE
- + "java.util.GregorianCalendar gcExamp" + getUniqueName()+ " = new java.util.GregorianCalendar();" + StringUtils.NEWLINE
- + "java.util.Date date" + getUniqueName()+ " = gcExamp" + getUniqueName()+ ".getTime();" + StringUtils.NEWLINE
- + "String tempResult" + getUniqueName()+ " = dateFormat" + getUniqueName()+ ".format(date" + getUniqueName()+ ");" + StringUtils.NEWLINE
- + "%>" + StringUtils.NEWLINE
-
-
- + "<TD ALIGN=\"left\">" + StringUtils.NEWLINE
- + "</TR>" + StringUtils.NEWLINE
- + "<TR>" + StringUtils.NEWLINE
- + "<TD> </TD>" + StringUtils.NEWLINE
- + "<TD ALIGN=\"left\"> eg. <%= tempResult" + getUniqueName()+ " %> </TD>" + StringUtils.NEWLINE
- + "</TR>" + StringUtils.NEWLINE;
-
-
-
- return inputForm;
- }
-
-
- /*
- * This function needs to be specialized
- * We must use the date function to help
- * us convert back and forth
- */
- public String stringConversion(String typeName, String nodeName, String attributeName)
- {
- String conversion = Generator.DOUBLE_TAB + "java.text.DateFormat dateFormat" + getUniqueName()+ " = java.text.DateFormat.getDateInstance();"
- + StringUtils.NEWLINE + Generator.DOUBLE_TAB + "java.util.Date dateTemp" + getUniqueName()+ " = dateFormat" + getUniqueName()+ ".parse(" + attributeName + ");"
- + StringUtils.NEWLINE + Generator.DOUBLE_TAB + Generator.SPACE + nodeName + " = " + "new java.util.GregorianCalendar();"
- + StringUtils.NEWLINE + Generator.DOUBLE_TAB + nodeName + ".setTime(dateTemp" + getUniqueName()+ ");"
- + "" + StringUtils.NEWLINE;
- return conversion;
- }
-
- /**
- * this is needed for most case
- * but it is peripheral as the stringconversion needed
- * to be overridden
- */
- public String StringToType(String name)
- {
- return "";
- }
-
- /**
- * converts the type returned from the proxy
- * back to a string
- * @return String convert the type to string.
- */
- public String TypeConversion(String name)
- {
-
- String conversion = Generator.DOUBLE_TAB + "java.text.DateFormat dateFormat" + getUniqueName()+ " = java.text.DateFormat.getDateInstance();" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "java.util.Date date" + getUniqueName()+ " = " + name + ".getTime();" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "String tempResult" + getUniqueName()+ " = org.eclipse.jst.ws.util.JspUtils.markup(dateFormat" + getUniqueName()+ ".format(date" + getUniqueName() + "));" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%= tempResult" + getUniqueName()+ " %>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%" + StringUtils.NEWLINE;
-
- return conversion;
- }
-
-
-
- /**
- * The stringConversion function nails out specific conversion methods used among simple types
- * This method is to be implemented by SimpleType subclasses
- * @param String the name of string after the request call
- * @return String the actual conversion string containing the name.
- */
- public String TypeToString(String name)
- {
- return "";
- }
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/HashtableType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/HashtableType.java
deleted file mode 100644
index a1ff2cf..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/HashtableType.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a recognized return type
-*
-*/
-public class HashtableType extends RecognizedReturnType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public HashtableType()
- {
- super(TypeFactory.HASHTABLE_NAME);
- }
-
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/MapType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/MapType.java
deleted file mode 100644
index 0035bfb..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/MapType.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a recognized return type
-*
-*/
-public class MapType extends RecognizedReturnType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public MapType()
- {
- super(TypeFactory.MAP_NAME);
- }
-
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/MethodElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/MethodElement.java
deleted file mode 100644
index 271e4ed..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/MethodElement.java
+++ /dev/null
@@ -1,129 +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.consumption.datamodel.beanmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-/**
-* Objects of this class represent a Java bean method.
-* Nearest moral equivalents: java.lang.reflect.Method, java.beans.MethodDescriptor.
-*/
-public class MethodElement extends BasicElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static final String REL_BEAN = "bean";
- public static final String REL_PARAMETERS = "parameters";
- public static final String REL_RETURN_PARAMETERS = "returnparameters";
- private String fDisplayName;
- private String fName;
- private boolean fMethodOmitted;
-
- /**
- * Constructor.
- * @param bean The Bean that owns this method.
- * @param name The name of the method.
- * @param type The type of the method.
- */
- public MethodElement ( BeanElement beanElement, String name, String displayName)
- {
- super(name,beanElement,REL_BEAN,BeanElement.REL_METHODS);
- fDisplayName = displayName;
- fName = name;
- fMethodOmitted = false;
-
- }
-
- /*
- * In the event that there is an unsupported type
- * we will set the ommission boolean variable
- * @return boolean true if this method is to be ommited
- */
- public boolean getMethodOmmission()
- {
- return fMethodOmitted;
- }
-
- /*
- * In the event that there is an unsupported type
- * we will get the ommission boolean variable
- * @param boolean true if this method is to be ommited
- */
- public void setMethodOmmission(boolean bool)
- {
- fMethodOmitted = bool;
- }
-
-
- public String getName()
- {
- return fName;
- }
-
- public String getDisplayName()
- {
- return fDisplayName;
- }
-
- /**
- * Returns the Bean that owns this method.
- * @return Bean The Bean that owns this method.
- */
- public BeanElement getBeanElement ()
- {
- Enumeration e = getElements(REL_BEAN);
- return e.hasMoreElements() ? (BeanElement)e.nextElement() : null;
- }
-
- /**
- * Returns an enumeration of the return parameter of this method.
- * @return Enumeration holds the return parameter of this method.
- */
- public Enumeration getReturnParameterEnum ()
- {
- return getElements(REL_RETURN_PARAMETERS);
- }
-
- /**
- * Returns an enumeration of the return parameter of this method.
- * @return Enumeration holds the return parameter of this method.
- */
- public ParameterElement getReturnParameterElement ()
- {
- Enumeration e = getReturnParameterEnum();
- return e.hasMoreElements() ? (ParameterElement)e.nextElement() : null;
- }
-
- /**
- * Returns an enumeration of all Parameter objects of this method.
- * @return Enumeration All Parameter objects of this method.
- */
- public Enumeration getParameterElements ()
- {
- return getElements(REL_PARAMETERS);
- }
-
- /**
- * Returns the number of Parameter objects of this method.
- * @return int The number of Parameter objects of this method.
- */
- public int getNumberOfParameterElements ()
- {
- return getNumberOfElements(REL_PARAMETERS);
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ObjectType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ObjectType.java
deleted file mode 100644
index deebdff..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ObjectType.java
+++ /dev/null
@@ -1,63 +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
- * -------- -------- -----------------------------------------------------------
- * 20060823 145643 mahutch@ca.ibm.com - Mark Hutchinson (created class)
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-*
-*/
-public class ObjectType extends SimpleType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public ObjectType()
- {
- super(TypeFactory.OBJECT_NAME);
- }
-
- /**
- * StringToType gets the string taken by the
- * user into proxy form
- * @return String convert the string to type .
- */
- public String StringToType(String name)
- {
- //We can't deserialize a String to an Object
- //this should never actually be called since
- //methods with Objects as input are omitted.
- return "new java.lang.Object();";
- }
-
- /**
- * The stringConversion function nails out specific conversion methods used among simple types
- * This method is to be implemented by SimpleType subclasses
- * @param String the name of string after the request call
- * @return String the actual conversion string containing the name.
- */
- public String TypeToString(String name)
- {
- return name + ".toString()";
- }
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ParameterElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ParameterElement.java
deleted file mode 100644
index 901cfc3..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ParameterElement.java
+++ /dev/null
@@ -1,83 +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.consumption.datamodel.beanmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-/**
-* Objects of this class represent a Java bean method parameter.
-* Nearest moral equivalents: java.beans.ParameterDescriptor.
-*/
-public class ParameterElement extends BasicElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static final String REL_METHOD = "method";
- public static final String REL_TYPE = "type";
-
- public boolean fReturnParameter=false;
-
- /**
- * Constructor.
- * @param method The Method that owns this parameter.
- * @param name The name of the parameter.
- * @param type The type of the parameter.
- */
- public ParameterElement ( MethodElement methodElement, String name, String relType,boolean returnParameter )
- {
- this(name,methodElement,REL_METHOD,relType);
- fReturnParameter = returnParameter;
- }
-
- /**
- * Constructor.
- * @param method The Method that owns this parameter.
- * @param name The name of the parameter.
- * @param type The type of the parameter.
- */
- public ParameterElement (String name, MethodElement methodElement, String outRel,String inRel)
- {
- super(name,methodElement,outRel,inRel);
- }
-
- /**
- * Returns the Method that owns this parameter.
- * @return Method The Method that owns this parameter.
- */
- public MethodElement getMethodElement ()
- {
- Enumeration e = getElements(REL_METHOD);
- return e.hasMoreElements() ? (MethodElement)e.nextElement() : null;
- }
-
- /**
- * Returns the Method that owns this parameter.
- * @return Method The Method that owns this parameter.
- */
- public TypeElement getTypeElement ()
- {
- Enumeration e = getElements(REL_TYPE);
- return e.hasMoreElements() ? (TypeElement)e.nextElement() : null;
- }
-
- public boolean isReturn()
- {
- return fReturnParameter;
- }
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveArrayType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveArrayType.java
deleted file mode 100644
index 3873061..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveArrayType.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* objects of this class represent a recognized return type
-*
-*/
-public class PrimitiveArrayType extends ArrayType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public PrimitiveArrayType(String typeName)
- {
- super(TypeFactory.PRIMITIVE_ARRAY_NAME, typeName);
- }
-
- /**
- * This is basically the function that dictates how we want to display this type
- * upon receiving it as a return from a proxy method
- * @param String the name of the type
- * @return String The display string
- */
- public String TypeConversion(String name)
- {
- String trippleTab = Generator.DOUBLE_TAB + Generator.TAB;
-
- String nonBean = Generator.DOUBLE_TAB + "String temp" + getUniqueName() + " = \"[\";"
- + Generator.DOUBLE_TAB + "for(int i" + getUniqueName() + "=0;i" +getUniqueName() + "< " + name
- + ".length;i" + getUniqueName() + "++){" + StringUtils.NEWLINE
- + trippleTab + "temp"+ getUniqueName() +" = temp"+getUniqueName() + " + " + name + "[i" + getUniqueName()
- + "] + \",\";" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "}" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "int length" + getUniqueName() + " = temp" + getUniqueName() + ".length();"
- + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "temp" + getUniqueName() + " = temp"+getUniqueName()+".substring(0,(length"+getUniqueName()+" - 1)) + \"]\";"
- + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%=temp"+ getUniqueName() +"%>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%"+ StringUtils.NEWLINE;
-
- return nonBean;
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveBooleanType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveBooleanType.java
deleted file mode 100644
index f58ad9d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveBooleanType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-*
-*/
-public class PrimitiveBooleanType extends PrimitiveType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public PrimitiveBooleanType()
- {
- super(TypeFactory.PRIM_BOOLEAN_NAME);
- }
-
- /**
- * StringToType gets the string taken by the
- * user into proxy form
- * @return String convert the string to type.
- */
- public String StringToType(String name)
- {
- String conversion = "Boolean.valueOf(" + name + ").booleanValue();";
- return conversion;
- }
-
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveByteType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveByteType.java
deleted file mode 100644
index 5045d26..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveByteType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-*
-*/
-public class PrimitiveByteType extends PrimitiveType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public PrimitiveByteType()
- {
- super(TypeFactory.PRIM_BYTE_NAME);
- }
-
- /**
- * StringToType gets the string taken by the
- * user into proxy form
- * @return String convert the string to type.
- */
- public String StringToType(String name)
- {
- String conversion = "Byte.parseByte(" + name + ");";
- return conversion;
- }
-
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveCharType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveCharType.java
deleted file mode 100644
index d52f903..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveCharType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-*
-*/
-public class PrimitiveCharType extends PrimitiveType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public PrimitiveCharType()
- {
- super(TypeFactory.PRIM_CHAR_NAME);
- }
-
- /**
- * StringToType gets the string taken by the
- * user into proxy form
- * @return String convert the string to type.
- */
- public String StringToType(String name)
- {
- String conversion = "" + name + ".charAt(0);";
- return conversion;
- }
-
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveDoubleType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveDoubleType.java
deleted file mode 100644
index 7b362e7..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveDoubleType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-*
-*/
-public class PrimitiveDoubleType extends PrimitiveType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public PrimitiveDoubleType()
- {
- super(TypeFactory.PRIM_DOUBLE_NAME);
- }
-
- /**
- * StringToType gets the string taken by the
- * user into proxy form
- * @return String convert the string to type.
- */
- public String StringToType(String name)
- {
- String conversion = "Double.parseDouble(" + name + ");";
- return conversion;
- }
-
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveFloatType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveFloatType.java
deleted file mode 100644
index 200f9d7..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveFloatType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-*
-*/
-public class PrimitiveFloatType extends PrimitiveType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public PrimitiveFloatType()
- {
- super(TypeFactory.PRIM_FLOAT_NAME);
- }
-
- /**
- * StringToType gets the string taken by the
- * user into proxy form
- * @return String convert the string to type.
- */
- public String StringToType(String name)
- {
- String conversion = "Float.parseFloat(" + name + ");";
- return conversion;
- }
-
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveIntType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveIntType.java
deleted file mode 100644
index 2f33dd9..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveIntType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-*
-*/
-public class PrimitiveIntType extends PrimitiveType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public PrimitiveIntType()
- {
- super(TypeFactory.PRIM_INTEGER_NAME);
- }
-
- /**
- * StringToType gets the string taken by the
- * user into proxy form
- * @return String convert the string to type.
- */
- public String StringToType(String name)
- {
- String conversion = "Integer.parseInt(" + name + ");";
- return conversion;
- }
-
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveJavaTypes.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveJavaTypes.java
deleted file mode 100644
index f715236..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveJavaTypes.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-/**
-* objects of this class represent a type
-*
-*/
-public class PrimitiveJavaTypes extends SimpleType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public PrimitiveJavaTypes(String type)
- {
- super(type);
- }
-
- /**
- * StringToType gets the string taken by the
- * user into proxy form
- * @return String convert the string to type .
- */
- public String StringToType(String name)
- {
- String conversion = fType + ".valueOf(" + name + ");";
- return conversion;
- }
-
- /**
- * The stringConversion function nails out specific conversion methods used among simple types
- * This method is to be implemented by SimpleType subclasses
- * @param String the name of string after the request call
- * @return String the actual conversion string containing the name.
- */
- public String TypeToString(String name)
- {
- return "String.valueOf(" + name + ")";
- }
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveLongType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveLongType.java
deleted file mode 100644
index ef0c826..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveLongType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-*
-*/
-public class PrimitiveLongType extends PrimitiveType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public PrimitiveLongType()
- {
- super(TypeFactory.PRIM_LONG_NAME);
- }
-
- /**
- * StringToType gets the string taken by the
- * user into proxy form
- * @return String convert the string to type.
- */
- public String StringToType(String name)
- {
- String conversion = "Long.parseLong(" + name + ");";
- return conversion;
- }
-
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveShortType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveShortType.java
deleted file mode 100644
index 8f91ce6..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveShortType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-*
-*/
-public class PrimitiveShortType extends PrimitiveType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public PrimitiveShortType()
- {
- super(TypeFactory.PRIM_SHORT_NAME);
- }
-
- /**
- * StringToType gets the string taken by the
- * user into proxy form
- * @return String convert the string to type.
- */
- public String StringToType(String name)
- {
- String conversion = "Short.parseShort(" + name + ");";
- return conversion;
- }
-
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveType.java
deleted file mode 100644
index 43106b8..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveType.java
+++ /dev/null
@@ -1,61 +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
- * -------- -------- -----------------------------------------------------------
- * 20071110 209087 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-/**
-* objects of this class represent a type
-*
-*/
-public abstract class PrimitiveType extends SimpleType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public PrimitiveType(String type)
- {
- super(type);
- }
-
- /**
- * The stringConversion function nails out specific conversion methods used among simple types
- * This method is to be implemented by SimpleType subclasses
- * @param String the name of string after the request call
- * @return String the actual conversion string containing the name.
- */
- public String stringConversion(String typeName, String nodeName, String attributeName)
- {
- String conversion = Generator.DOUBLE_TAB + typeName + Generator.SPACE + nodeName
- + Generator.SPACE + " = " + StringToType(attributeName)
- + "" + StringUtils.NEWLINE;
- return conversion;
- }
-
- public String TypeToString(String name)
- {
- return "String.valueOf(" + name + ")";
- }
-
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/RecognizedReturnType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/RecognizedReturnType.java
deleted file mode 100644
index fc721a8..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/RecognizedReturnType.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* objects of this class represent a recognized return type
-*
-*/
-public class RecognizedReturnType implements DataType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- protected String fType;
- protected String fUniqueName;
-
- /**
- *Constructor
- *
- */
- public RecognizedReturnType(String type)
- {
- fType = type;
- fUniqueName = "";
- }
-
- /**
- * not relevant at this point
- */
- public String inputForm(String name)
- {
- return "";
- }
-
- /**
- * again not relevant
- */
- public String getRequestCode(String name, String id)
- {
- return "";
- }
-
- /**
- * This function hands back the code required to go from the
- * string the user entered to the actual type of the element
- * @param String typeName this is the actual name of the type ie int,boolean
- * @param String nodeName The nodeName is just the attributename + Temp.
- * @param String the attributeName
- * @return String convert the string to type .
- */
- public String stringConversion(String typeName, String nodeName, String attributeName)
- {
- return "";
- }
-
- /**
- * This is basically the function that dictates how we want to display this type
- * upon receiving it as a return from a proxy method
- * @param String the name of the type
- * @return String The display string
- */
- public String TypeConversion(String name)
- {
- String nonBean = Generator.DOUBLE_TAB + "if(" + name + "!= null){" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "String temp" + getUniqueName()+" = " + name + ".toString();" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%=temp" + getUniqueName() +"%>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "}";
- return nonBean;
- }
-
- /**
- * return the name of this type
- * @return String the name(including package).
- */
- public String getType()
- {
- return fType;
- }
-
- public String getUniqueName()
- {
- return fUniqueName;
- }
-
- public void setUniqueName(String name)
- {
- fUniqueName = name;
- }
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SOAPElementType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SOAPElementType.java
deleted file mode 100644
index 7c331a4..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SOAPElementType.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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
- * -------- -------- -----------------------------------------------------------
- * 20090917 289800 mahutch@ca.ibm.com - Mark Hutchinson, SOAPElement or Element parameters result in compile errors in sample
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* objects of this class represent a type
-*
-*/
-public class SOAPElementType implements DataType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- protected String fType;
- protected String fUniqueName;
-
- /**
- *Constructor
- *
- */
- public SOAPElementType()
- {
- fType = "javax.xml.soap.SOAPElement";
- fUniqueName = "";
- }
-
- /**
- * inputForm returns the user input html
- * The DomElement form is a text box
- * @param String name The name of the input element
- * @return String The form used to collect the data
- */
- public String inputForm(String name)
- {
- String inputForm = "<TD ALIGN=\"left\"><TEXTAREA Rows=7 Cols=45 NAME=\""
- + name + "\"></TEXTAREA></TD>" + StringUtils.NEWLINE
- + "</TR>" + StringUtils.NEWLINE;
- return inputForm;
- }
-
- /**
- * This function dictates how you want to process the
- * incoming string from the input jsp. You may or may not use the markup
- * function depending on the type. The simple types use it. DomElement does not
- * @param String the name of the attribute
- * @return String the code to be generated
- */
- public String getRequestCode(String name, String id)
- {
- String requestCode = Generator.DOUBLE_TAB + "String" + Generator.SPACE
- + id + "= request.getParameter(\""
- + name +"\");" + StringUtils.NEWLINE;
- return requestCode;
- }
-
- /**
- * This function hands back the code required to go from the
- * string the user entered to the actual type of the element
- * @param String typeName this is the actual name of the type ie int,boolean
- * @param String nodeName The nodeName is just the attributename + Temp.
- * @param String the attributeName
- * @return String convert the string to type .
- */
- public String stringConversion(String typeName, String nodeName, String attributeName)
- {
- String conversion = Generator.DOUBLE_TAB
- + nodeName + "= org.eclipse.jst.ws.util.SoapElementHelper.createSOAPElementFromXMLString(" + attributeName + ");"
- + StringUtils.NEWLINE;
- return conversion;
- }
-
- /**
- * This is basically the function that dictates how we want to display this type
- * upon receiving it as a return from a proxy method
- * @param String the name of the type
- * @return String The display string
- */
- public String TypeConversion(String name)
- {
- String typeToString = Generator.DOUBLE_TAB + "String tempResult" + getUniqueName()+ " = org.eclipse.jst.ws.util.SoapElementHelper.soapElementWriter(" + name + ", new java.lang.StringBuffer()" + ");" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%= tempResult" + getUniqueName()+ " %>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%" + StringUtils.NEWLINE;
-
- return typeToString;
- }
-
- /**
- * return the name of this type
- * @return String the name(including package).
- */
- public String getType()
- {
- return fType;
- }
-
- public String getUniqueName()
- {
- return fUniqueName;
- }
-
- public void setUniqueName(String name)
- {
- fUniqueName = name;
- }
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SimpleElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SimpleElement.java
deleted file mode 100644
index f478345..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SimpleElement.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* 1 of three type elements represents primitives
-*/
-public class SimpleElement extends TypeElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- * Constructor
- * @param ParameterElement The Parameter that owns this simple type.
- * @param String Name of the simple element.
- */
- public SimpleElement ( ParameterElement parameterElement, String name, boolean prim)
- {
- super(name,parameterElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.SIMPLE);
- fOwnerType = TypeElement.PARAMETER_OWNER;
- setPrimitive(prim);
- }
-
- /**
- * Constructor
- * @param ParameterElement The Attribute that owns this simple type.
- * @param String Name of the AttributeElement.
- */
- public SimpleElement ( AttributeElement attributeElement, String name, boolean prim)
- {
- super(name,attributeElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.SIMPLE);
- fOwnerType = TypeElement.ATTRIBUTE_OWNER;
- setPrimitive(prim);
- }
-
- /**
- * Constructor
- * @param ParameterElement The Attribute that owns this simple type.
- * @param String Name of the AttributeElement.
- */
- public SimpleElement ( FieldElement fieldElement, String name, boolean prim)
- {
- super(name,fieldElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.SIMPLE);
- fOwnerType = TypeElement.FIELD_OWNER;
- setPrimitive(prim);
- }
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SimpleType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SimpleType.java
deleted file mode 100644
index 116ede9..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SimpleType.java
+++ /dev/null
@@ -1,143 +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
- * -------- -------- -----------------------------------------------------------
- * 20071110 209087 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* objects of this class represent a type
-*
-*/
-public abstract class SimpleType implements DataType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- protected String fType;
- protected String fUniqueName;
-
- /**
- *Constructor
- *
- */
- public SimpleType(String type)
- {
- fType = type;
- }
-
- /**
- * inputForm returns the user input html
- * The simple form is just a text input box
- * @param String name The name of the input element
- * @return String The form used to collect the data
- */
- public String inputForm(String name)
- {
- String inputForm = "<TD ALIGN=\"left\"><INPUT TYPE=\"TEXT\" NAME=\""
- + name + "\" SIZE=20></TD>" + StringUtils.NEWLINE
- + "</TR>" + StringUtils.NEWLINE;
- return inputForm;
- }
-
- /**
- * This function dictates how you want to process the
- * incoming string from the input jsp. You may or may not use the markup
- * function depending on the type. The simple types use it. DomElement does not
- * @param String the name of the attribute
- * @return String the code to be generated
- */
- public String getRequestCode(String name, String id)
- {
- String requestCode = Generator.DOUBLE_TAB + "String" + Generator.SPACE
- + id + "= request.getParameter(\""
- + name +"\");" + StringUtils.NEWLINE;
- return requestCode;
- }
-
- /**
- * This function hands back the code required to go from the
- * string the user entered to the actual type of the element
- * it uses another function that all subclasses of SimpleType are required to implement
- * The StringToType function
- * @param String typeName this is the actual name of the type ie int,boolean
- * @param String nodeName The nodeName is just the attributename + Temp.
- * @param String the attributeName
- * @return String convert the string to type .
- */
- public String stringConversion(String typeName, String nodeName, String attributeName)
- {
- String conversion = Generator.DOUBLE_TAB + Generator.SPACE + nodeName
- + Generator.SPACE + " = " + StringToType(attributeName)
- + "" + StringUtils.NEWLINE;
- return conversion;
- }
-
- /**
- * The stringConversion function nails out specific conversion methods used among simple types
- * This method is to be implemented by SimpleType subclasses
- * @param String the name of string after the request call
- * @return String the actual conversion string containing the name.
- */
- public abstract String StringToType(String name);
-
- /**
- * converts the type returned from the proxy
- * back to a string
- * @return String convert the type to string.
- */
- public String TypeConversion(String name)
- {
-
- String conversion = Generator.DOUBLE_TAB + "String tempResult" + getUniqueName()+ " = org.eclipse.jst.ws.util.JspUtils.markup(" + TypeToString(name) + ");" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%= tempResult" + getUniqueName()+ " %>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%" + StringUtils.NEWLINE;
-
- return conversion;
- }
-
- /**
- * The stringConversion function nails out specific conversion methods used among simple types
- * This method is to be implemented by SimpleType subclasses
- * @param String the name of string after the request call
- * @return String the actual conversion string containing the name.
- */
- public abstract String TypeToString(String name);
-
- /**
- * return the name of this type
- * @return String the name(including package).
- */
- public String getType()
- {
- return fType;
- }
-
- public String getUniqueName()
- {
- return fUniqueName;
- }
-
- public void setUniqueName(String name)
- {
- fUniqueName = name;
- }
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/StateLessBeanType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/StateLessBeanType.java
deleted file mode 100644
index 40f9d6c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/StateLessBeanType.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a recognized return type
-*
-*/
-public class StateLessBeanType extends RecognizedReturnType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
-
- public StateLessBeanType(String name)
- {
- super(TypeFactory.STATELESS_BEAN);
- }
-
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/StringType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/StringType.java
deleted file mode 100644
index 1b99c74..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/StringType.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-/**
-* objects of this class represent a type
-*
-*/
-public class StringType extends SimpleType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public StringType()
- {
- super(TypeFactory.STRING_NAME);
- }
-
- /**
- * StringToType gets the string taken by the
- * user into proxy form
- * @return String convert the string to type .
- */
- public String StringToType(String name)
- {
- String conversion = name + ";";
- return conversion;
- }
-
- /**
- * The stringConversion function nails out specific conversion methods used among simple types
- * This method is to be implemented by SimpleType subclasses
- * @param String the name of string after the request call
- * @return String the actual conversion string containing the name.
- */
- public String TypeToString(String name)
- {
- return "String.valueOf(" + name + ")";
- }
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/TypeElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/TypeElement.java
deleted file mode 100644
index af80d7f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/TypeElement.java
+++ /dev/null
@@ -1,195 +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
- * -------- -------- -----------------------------------------------------------
- * 20070410 180952 makandre@ca.ibm.com - Andrew Mak, Sample JSP generator chokes on interfaces and abstract classes
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-/**
-* TypeElement is the base class for Java bean features that have types.
-*/
-public abstract class TypeElement extends BasicElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- public static final String NON_INSTANTIABLE = "nonInstantiable";
-
- public static int BEAN = 0;
- public static int SIMPLE = 1;
- public static int ARRAY = 2;
-
- private int fType;
- protected int fOwnerType;
- private boolean fPrimitive = false;
-
- /**
- * Constructor. Automatically adds this object to the given model.
- * @param name The name of the element
- * @param model The model to own this object.
- * @param type The type represented by this object, one of
- * <code>BEAN</code>, <code>SIMPLE</code> or <code>ARRAY</code>.
- */
- protected TypeElement ( String name, Model model, int type )
- {
- super(name,model);
- fType = type;
- }
-
- /**
- */
- protected TypeElement ( String name, Element element, String outboundRelName, String inboundRelName, int type )
- {
- super(name,element,outboundRelName,inboundRelName);
- fType = type;
- }
-
- /*
- *This will tell you wether the type is a bean
- *@param Boolean returns true if this is bean
- **/
- public boolean isBean()
- {
- if (fType == BEAN) return true;
- return false;
- }
-
- /*
- *This will tell you wether the type is a bean
- *@param Boolean returns true if this is bean
- **/
- public boolean isPrimitive()
- {
- return fPrimitive;
- }
-
- /*
- *This will tell you wether the type is a bean
- *@param Boolean returns true if this is bean
- **/
- protected void setPrimitive(boolean prim)
- {
- fPrimitive = prim;
- }
-
-
- /*
- * This is mainly needed for arrays as with all types the
- * names come out as java.util.type, but with an array it
- * isnt explicit in telling us its an array
- */
- public String getTypeName()
- {
- return getName();
- }
-
- /*
- *This will tell you wether the type is a simple
- *@param Boolean returns true if this is simple
- **/
- public boolean isSimple()
- {
- if (fType == SIMPLE) return true;
- return false;
- }
-
- /*
- *This will tell you wether the type is a array
- *@param Boolean returns true if this is array
- **/
- public boolean isArray()
- {
- if (fType == ARRAY) return true;
- return false;
- }
-
- public static String REL_ATTRIBUTES = "attributes";
- public static String REL_FIELDS = "fields";
- public static final String REL_TYPE = "type";
- public static final String REL_OWNER = "owner";
-
- public static int PARAMETER_OWNER = 0;
- public static int ATTRIBUTE_OWNER = 1;
- public static int FIELD_OWNER = 2;
- public static int ROOT = 3;
-
- /*
- * This could be The root test bean
- * @return boolean true if this is root bean
- */
- public boolean isRoot()
- {
- if(fOwnerType == ROOT) return true;
- return false;
- }
-
- /*
- * This Type could be owned by a Parameter or an attribute
- * @return boolean true if this is owned by a parameter
- */
- public boolean isOwnerParameter()
- {
- if(fOwnerType == PARAMETER_OWNER) return true;
- return false;
- }
-
- /*
- * This Type could be owned by a Parameter or an attribute
- * @return boolean true if this is owned by an attribute
- */
- public boolean isOwnerAttribute()
- {
- if(fOwnerType == ATTRIBUTE_OWNER) return true;
- return false;
- }
-
- /*
- * This Type could be owned by a Parameter or an attribute
- * @return boolean true if this is owned by an attribute
- */
- public boolean isOwnerField()
- {
- if(fOwnerType == FIELD_OWNER) return true;
- return false;
- }
-
- /**
- * This Type may be owned by a parameter or an attribute
- * Use this method in conjunction with isOwnerParamter, isOwner
- * @return BasicElement the element that owns this attribute.
- */
- public BasicElement getOwningElement ()
- {
- if (isOwnerParameter()){
- Enumeration e = getElements(REL_OWNER);
- return e.hasMoreElements() ? (BasicElement)e.nextElement() : null;
- }
- else if(isOwnerAttribute()){
- Enumeration e = getElements(REL_OWNER);
- return e.hasMoreElements() ? (BasicElement)e.nextElement() : null;
- }
- else if(isOwnerField()){
- Enumeration e = getElements(REL_OWNER);
- return e.hasMoreElements() ? (BasicElement)e.nextElement() : null;
- }
-
- return null;
- }
-
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/TypeFactory.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/TypeFactory.java
deleted file mode 100644
index 7bed616..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/TypeFactory.java
+++ /dev/null
@@ -1,263 +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
- * -------- -------- -----------------------------------------------------------
- * 20060726 145676 gilberta@ca.ibm.com - Gilbert Andrews
- * 20060823 145643 mahutch@ca.ibm.com - Mark Hutchinson
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import java.util.Hashtable;
-import org.eclipse.jem.java.JavaHelpers;
-/**
- * TypeFactory
- * Creation date: (4/10/2001 12:41:48 PM)
- * @author: Gilbert Andrews
- */
-public class TypeFactory
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static final String URL_NAME = "java.net.URL";
- public static final String STRING_NAME = "java.lang.String";
- public static final String BIG_DECIMAL_NAME = "java.math.BigDecimal";
- public static final String BIG_INTEGER_NAME = "java.math.BigInteger";
- public static final String DATE_NAME = "java.util.Date";
- public static final String GREGORIAN_CALENDAR_NAME = "java.util.GregorianCalendar";
- public static final String CALENDAR_NAME = "java.util.Calendar";
- public static final String BOOLEAN_NAME = "java.lang.Boolean";
- public static final String BYTE_NAME = "java.lang.Byte";
- public static final String DOUBLE_NAME = "java.lang.Double";
- public static final String FLOAT_NAME = "java.lang.Float";
- public static final String INTEGER_NAME = "java.lang.Integer";
- public static final String LONG_NAME = "java.lang.Long";
- public static final String SHORT_NAME = "java.lang.Short";
- public static final String CHARACTER_NAME = "java.lang.Character";
- public static final String OBJECT_NAME = "java.lang.Object";
- public static final String PRIM_BOOLEAN_NAME = "boolean";
- public static final String PRIM_BYTE_NAME = "byte";
- public static final String PRIM_DOUBLE_NAME = "double";
- public static final String PRIM_FLOAT_NAME = "float";
- public static final String PRIM_INTEGER_NAME = "int";
- public static final String PRIM_LONG_NAME = "long";
- public static final String PRIM_SHORT_NAME = "short";
- public static final String PRIM_CHAR_NAME = "char";
- public static final String VOID_NAME = "void";
-
- //some special complex
- public static final String DOM_ELEMENT_NAME = "org.w3c.dom.Element";
- public static final String SOAP_ELEMENT_NAME = "javax.xml.soap.SOAPElement";
- public static final String STATELESS_BEAN = BeanElement.STATELESS_BEAN;
-
-
-
- public static Hashtable javaTypes = new Hashtable();
-
- public TypeFactory(){}
-
- static{
- javaTypes.put(BOOLEAN_NAME,new PrimitiveJavaTypes(BOOLEAN_NAME));
- javaTypes.put(BYTE_NAME, new PrimitiveJavaTypes(BYTE_NAME));
- javaTypes.put(DOUBLE_NAME, new PrimitiveJavaTypes(DOUBLE_NAME));
- javaTypes.put(FLOAT_NAME, new PrimitiveJavaTypes(FLOAT_NAME));
- javaTypes.put(INTEGER_NAME,new PrimitiveJavaTypes(INTEGER_NAME));
- javaTypes.put(LONG_NAME, new PrimitiveJavaTypes(LONG_NAME));
- javaTypes.put(SHORT_NAME, new PrimitiveJavaTypes(SHORT_NAME));
- javaTypes.put(CHARACTER_NAME, new PrimitiveJavaTypes(CHARACTER_NAME));
- }
-
-
- /*
- * This function allows us to handle recognized beans
- * in displaying and generating code for them instead of
- * treating them as complex types
- */
- public static boolean recognizedBean(String type)
- {
-
- //
- //current recognized beans (mostly java.lang)
- if (type.equals(BOOLEAN_NAME) ||
- type.equals(BYTE_NAME) ||
- type.equals(DOUBLE_NAME) ||
- type.equals(FLOAT_NAME) ||
- type.equals(INTEGER_NAME) ||
- type.equals(LONG_NAME) ||
- type.equals(SHORT_NAME) ||
- type.equals(CHARACTER_NAME) ||
- type.equals(DOM_ELEMENT_NAME) ||
- type.equals(SOAP_ELEMENT_NAME) ||
- type.equals(BIG_DECIMAL_NAME) ||
- type.equals(BIG_INTEGER_NAME) ||
- type.equals(DATE_NAME) ||
- type.equals(GREGORIAN_CALENDAR_NAME) ||
- type.equals(CALENDAR_NAME) ||
- type.equals(URL_NAME) ||
- type.equals(OBJECT_NAME) ||
- type.equals(STRING_NAME)) return true;
- return false;
-
- }
-
- /*
- * This function allows us to handle unsupported types
- * if we dont want to support a type and we want to omitt this
- * method from the samples
- * @param javaHelpers this is the type to be evaluated
- * @return boolean true if the type is not supported
- */
- public static boolean isUnSupportedType(JavaHelpers javaHelpers)
- {
- //we also dont support arrays
- //java.lang.Objects are ok for return types but not for input type
- if (javaHelpers.isArray()||
- javaHelpers.getJavaName().equals(MAP_NAME)||
- javaHelpers.getJavaName().equals(VECTOR_NAME)||
- javaHelpers.getJavaName().equals(DATA_HANDLER)||
- javaHelpers.getJavaName().equals(OBJECT_NAME) ||
- javaHelpers.getJavaName().equals("java.lang.class") ) return true;
-
- return false;
- }
-
- public static String HASHTABLE_NAME = "java.util.Hashtable";
- public static String MAP_NAME = "java.util.Map";
- public static String VECTOR_NAME = "java.util.Vector";
- public static String ARRAY_NAME = ArrayElement.ARRAY_NAME;
- public static String PRIMITIVE_ARRAY_NAME = "primitivearray";
- public static String DATA_HANDLER = "javax.activation.DataHandler";
-
- public static boolean isRecognizedReturnType(JavaHelpers javaHelpers)
- {
- //arrays
- //Hashtable
- //Vectors
- //java.lang.Objects are ok for return types
- if (javaHelpers.isArray()) return true;
- else if (javaHelpers.getJavaName().equals(HASHTABLE_NAME))return true;
- else if (javaHelpers.getJavaName().equals(VECTOR_NAME))return true;
- else if (javaHelpers.getJavaName().equals(MAP_NAME))return true;
- else if (javaHelpers.getJavaName().equals(OBJECT_NAME))return true;
- else return false;
- }
-
- public static boolean isRecognizedReturnType(String type)
- {
- //arrays
- //Hashtable
- //Vectors
- //java.lang.Objects are ok for return types
- if (type.startsWith(ARRAY_NAME)) return true;
- else if (type.equals(HASHTABLE_NAME))return true;
- else if (type.equals(VECTOR_NAME))return true;
- else if (type.equals(MAP_NAME))return true;
- else if (type.equals(OBJECT_NAME)) return true;
- else return false;
- }
-
- public static boolean isStateLessBean(String type)
- {
- if(type.startsWith(STATELESS_BEAN)) return true;
- return false;
- }
-
-
- /**
- * Creates a type based on the JavaHelper then sets this type in the element
- * @params JavaHelpers this holds the type
- * @param TypeElement The element which will hold the type created
- * @param String Uniquename to be used when naming temp variables
- */
-
- public static DataType createType(String type, String UniqueName)
- {
- //this guy might be both stateless and one of the below elements
- //we would like to be as specific as we can, stateless is the worst case
- boolean stateless = false;
- if(type.startsWith(STATELESS_BEAN)) {
- stateless = true;
- type = type.substring(29);
- }
-
- DataType datatype = null;
- if (type.equals(PRIM_BOOLEAN_NAME)) datatype = new PrimitiveBooleanType();
- else if (type.equals(PRIM_BYTE_NAME)) datatype = new PrimitiveByteType();
- else if (type.equals(PRIM_DOUBLE_NAME)) datatype = new PrimitiveDoubleType();
- else if (type.equals(PRIM_FLOAT_NAME)) datatype = new PrimitiveFloatType();
- else if (type.equals(PRIM_LONG_NAME)) datatype = new PrimitiveLongType();
- else if (type.equals(PRIM_INTEGER_NAME)) datatype = new PrimitiveIntType();
- else if (type.equals(PRIM_CHAR_NAME)) datatype = new PrimitiveCharType();
- else if (type.equals(PRIM_SHORT_NAME)) datatype = new PrimitiveShortType();
-
-
- //see if this critter is a javatype
- else if (type.equals(BOOLEAN_NAME) ||
- type.equals(BYTE_NAME) ||
- type.equals(DOUBLE_NAME) ||
- type.equals(FLOAT_NAME) ||
- type.equals(INTEGER_NAME) ||
- type.equals(LONG_NAME) ||
- type.equals(CHARACTER_NAME) ||
- type.equals(SHORT_NAME)) datatype = (DataType)javaTypes.get(type);
-
- //see if its a case we handle
- else if (type.equals(STRING_NAME)) datatype = new StringType();
- else if (type.equals(VOID_NAME)) datatype = new VoidType();
- else if (type.equals(DOM_ELEMENT_NAME)) datatype = new DomElementType();
- else if (type.equals(SOAP_ELEMENT_NAME)) datatype = new SOAPElementType();
- else if (type.equals(BIG_DECIMAL_NAME)) datatype = new BigDecimalType();
- else if (type.equals(BIG_INTEGER_NAME)) datatype = new BigIntegerType();
- else if (type.equals(DATE_NAME)) datatype = new DateType();
- else if (type.equals(URL_NAME)) datatype = new URLType();
- else if (type.equals(GREGORIAN_CALENDAR_NAME)) datatype = new GregorianCalendarType();
- else if (type.equals(CALENDAR_NAME)) datatype = new GregorianCalendarType();
-
- //it could be a return type we support
- else if (type.equals(HASHTABLE_NAME)) datatype = new HashtableType();
- else if (type.equals(VECTOR_NAME)) datatype = new VectorType();
- else if (type.equals(MAP_NAME)) datatype = new MapType();
- else if (type.equals(OBJECT_NAME)) datatype = new ObjectType();
-
- // need to see if it is an object array
- //or a primitive
- else if (type.startsWith(ARRAY_NAME)){
- String name = type.substring(21);
- if(name.startsWith(PRIM_BOOLEAN_NAME) ||
- name.startsWith(PRIM_BYTE_NAME) ||
- name.startsWith(PRIM_DOUBLE_NAME) ||
- name.startsWith(PRIM_FLOAT_NAME) ||
- name.startsWith(PRIM_LONG_NAME) ||
- name.startsWith(PRIM_INTEGER_NAME) ||
- name.startsWith(PRIM_CHAR_NAME) ||
- name.startsWith(PRIM_SHORT_NAME))
- datatype = new PrimitiveArrayType(name);
- else
- datatype = new ArrayType(name);
-
- }
- else if (stateless){
- datatype = new StateLessBeanType(type);
-
- }
-
-
- datatype.setUniqueName(UniqueName);
- return datatype;
-
- }
-
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/URLType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/URLType.java
deleted file mode 100644
index 9c0fb28..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/URLType.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-/**
-* objects of this class represent a type
-*
-*/
-public class URLType extends SimpleType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public URLType()
- {
- super(TypeFactory.URL_NAME);
- }
-
- /**
- * StringToType gets the string taken by the
- * user into proxy form
- * @return String convert the string to type .
- */
- public String StringToType(String name)
- {
- String conversion = "new java.net.URL(" + name + ");";
- return conversion;
- }
-
- /**
- * The stringConversion function nails out specific conversion methods used among simple types
- * This method is to be implemented by SimpleType subclasses
- * @param String the name of string after the request call
- * @return String the actual conversion string containing the name.
- */
- public String TypeToString(String name)
- {
- return name + ".toString()";
- }
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/VectorType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/VectorType.java
deleted file mode 100644
index 5a0718d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/VectorType.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a recognized return type
-*
-*/
-public class VectorType extends RecognizedReturnType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public VectorType()
- {
- super(TypeFactory.VECTOR_NAME);
- }
-
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/VoidType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/VoidType.java
deleted file mode 100644
index 5fde91e..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/VoidType.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-*
-*/
-public class VoidType extends SimpleType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public VoidType()
- {
- super("void");
- }
-
- /**
- * for a void there is no need to return
- * @return String convert the string to type .
- */
- public String StringToType(String name)
- {
- return "";
- }
-
- /**
- * The stringConversion function nails out specific conversion methods used among simple types
- * This method is to be implemented by SimpleType subclasses
- * @param String the name of string after the request call
- * @return String the actual conversion string containing the name.
- */
- public String TypeToString(String name)
- {
- return "String.valueOf(" + name + ")";
- }
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/validate/ValidationManager.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/validate/ValidationManager.java
deleted file mode 100644
index bc0128e..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/validate/ValidationManager.java
+++ /dev/null
@@ -1,112 +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.consumption.datamodel.validate;
-
-import java.util.HashSet;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-/**
- * This class manages the validation state of projects that some tasks may want
- * to disable. The manager can then be used to restore the validation state.
-**/
-public class ValidationManager
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * This set contains a set of IProjects that need to be validated.
- **/
- private HashSet projects = null;
-
- /**
- * This object contains a reference to the j2ee validator.
- **/
- //pgm private ValidatorManager j2eeManager = null;
-
- /**
- * This boolean contains the auto build setting under preferrence
- **/
- private boolean isAutoBuild_;
- private boolean autoBuildDisabled_;
-
- public ValidationManager()
- {
- projects = new HashSet();
- //pgm j2eeManager = ValidatorManager.getManager();
- setAutoBuildPreference();
- autoBuildDisabled_ = false;
- }
-
- /**
- * Disables the validation for a project if required.
- **/
- public void disableValidationForProject( IProject project )
- {
- // We need to remember that this project needs have validation turned back on.
- projects.add( project );
-
- //pgm j2eeManager.suspendAllValidation( true );
- }
-
- /**
- * Restores the validation state for all needed projects.
- **/
- public void restoreValidationForProjects( boolean runValidation )
- {
- }
-
- public void modifyAutoBuild(boolean isAutoBuild) {
- try {
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IWorkspaceDescription workspaceDesc = workspace.getDescription();
- workspaceDesc.setAutoBuilding(isAutoBuild);
- workspace.setDescription(workspaceDesc);
- }
- catch (Exception e) {}
- }
-
- public void disableAutoBuild() {
- if (!autoBuildDisabled_) {
- setAutoBuildPreference();
- modifyAutoBuild(false);
- autoBuildDisabled_ = true;
- }
- }
-
- public void restoreAutoBuild() {
- if (autoBuildDisabled_) {
- modifyAutoBuild(getAutoBuildPreference());
- autoBuildDisabled_ = false;
- }
- }
-
- public boolean setAutoBuildPreference() {
- isAutoBuild_ = getWorkspaceAutoBuildPreference();
- return isAutoBuild_;
- }
-
- public boolean getAutoBuildPreference() {
- return isAutoBuild_;
- }
-
- public boolean getWorkspaceAutoBuildPreference() {
- IWorkspaceDescription workspaceDesc = ResourcesPlugin.getWorkspace().getDescription();
- return workspaceDesc.isAutoBuilding();
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/BindingElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/BindingElement.java
deleted file mode 100644
index 3ab1a2c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/BindingElement.java
+++ /dev/null
@@ -1,54 +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.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-public class BindingElement extends BasicElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static String REL_PORT = "port";
- public static String REL_OPERATIONS = "operations";
- public static String REL_PORT_TYPE = "porttype";
-
- public BindingElement (PortElement portElement,String name)
- {
- super(name,portElement,REL_PORT,PortElement.REL_BINDING);
- }
-
- public Enumeration getPort()
- {
- return getElements(REL_PORT);
- }
-
- public Enumeration getPortType()
- {
- return getElements(REL_PORT_TYPE);
- }
-
- public Enumeration getOperations()
- {
- return getElements(REL_OPERATIONS);
- }
-
- public int getNumberOfOperations()
- {
- return getNumberOfElements(REL_OPERATIONS);
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/DefinitionElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/DefinitionElement.java
deleted file mode 100644
index 8454c22..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/DefinitionElement.java
+++ /dev/null
@@ -1,48 +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.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-public class DefinitionElement extends BasicElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static String REL_SERVICES = "services";
- public static String REL_WSDL = "wsdl";
-
- public DefinitionElement (WSDLElement wsdlElement,String name)
- {
- super(name,wsdlElement,REL_WSDL,WSDLElement.REL_DEFINITIONS);
- }
-
- public Enumeration getWSDL()
- {
- return getElements(REL_WSDL);
- }
-
- public Enumeration getServices()
- {
- return getElements(REL_SERVICES);
- }
-
- public int getNumberOfServices()
- {
- return getNumberOfElements(REL_SERVICES);
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/MessageElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/MessageElement.java
deleted file mode 100644
index dbe2781..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/MessageElement.java
+++ /dev/null
@@ -1,48 +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.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-public class MessageElement extends BasicElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static String REL_OPERATION = "operation";
- public static String REL_PARTS = "parts";
-
- public MessageElement (OperationElement operationElement,String name)
- {
- super(name,operationElement,REL_OPERATION,OperationElement.REL_MESSAGES);
- }
-
- public Enumeration getOperation()
- {
- return getElements(REL_OPERATION);
- }
-
- public Enumeration getParts()
- {
- return getElements(REL_PARTS);
- }
-
- public int getNumberOfParts()
- {
- return getNumberOfElements(REL_PARTS);
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/OperationElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/OperationElement.java
deleted file mode 100644
index 2489c2e..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/OperationElement.java
+++ /dev/null
@@ -1,48 +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.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-public class OperationElement extends BasicElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static String REL_BINDING = "binding";
- public static String REL_MESSAGES = "messages";
-
- public OperationElement (BindingElement bindingElement,String name)
- {
- super(name,bindingElement,REL_BINDING,BindingElement.REL_OPERATIONS);
- }
-
- public Enumeration getBinding()
- {
- return getElements(REL_BINDING);
- }
-
- public Enumeration getMessages()
- {
- return getElements(REL_MESSAGES);
- }
-
- public int getNumberOfMessages()
- {
- return getNumberOfElements(REL_MESSAGES);
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PartElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PartElement.java
deleted file mode 100644
index 42400dc..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PartElement.java
+++ /dev/null
@@ -1,39 +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.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-public class PartElement extends BasicElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static String REL_MESSAGE = "message";
-
- public PartElement (MessageElement messageElement,String name)
- {
- super(name,messageElement,REL_MESSAGE,MessageElement.REL_PARTS);
- }
-
- public Enumeration getMessage()
- {
- return getElements(REL_MESSAGE);
- }
-
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PortElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PortElement.java
deleted file mode 100644
index 06bda94..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PortElement.java
+++ /dev/null
@@ -1,44 +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.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-public class PortElement extends BasicElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static String REL_BINDING = "binding";
- public static String REL_SERVICE = "service";
-
- public PortElement (ServiceElement serviceElement,String name)
- {
- super(name,serviceElement,REL_SERVICE,ServiceElement.REL_PORTS);
- }
-
- public Enumeration getService()
- {
- return getElements(REL_SERVICE);
- }
-
- public Enumeration getBinding()
- {
- return getElements(REL_BINDING);
- }
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PortTypeElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PortTypeElement.java
deleted file mode 100644
index 9ed1560..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PortTypeElement.java
+++ /dev/null
@@ -1,39 +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.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-public class PortTypeElement extends BasicElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static String REL_BINDING = "binding";
-
- public PortTypeElement (BindingElement bindingElement,String name)
- {
- super(name,bindingElement,REL_BINDING,BindingElement.REL_PORT_TYPE);
- }
-
- public Enumeration getBinding()
- {
- return getElements(REL_BINDING);
- }
-
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/ServiceElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/ServiceElement.java
deleted file mode 100644
index e591d7f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/ServiceElement.java
+++ /dev/null
@@ -1,48 +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.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-public class ServiceElement extends BasicElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static String REL_PORTS = "ports";
- public static String REL_DEFINITION = "definition";
-
- public ServiceElement (DefinitionElement definitionElement,String name)
- {
- super(name,definitionElement,REL_DEFINITION,DefinitionElement.REL_SERVICES);
- }
-
- public Enumeration getDefinition()
- {
- return getElements(REL_DEFINITION);
- }
-
- public Enumeration getPorts()
- {
- return getElements(REL_PORTS);
- }
-
- public int getNumberOfPorts()
- {
- return getNumberOfElements(REL_PORTS);
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/StubbedWSDLModel.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/StubbedWSDLModel.java
deleted file mode 100644
index b28fa76..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/StubbedWSDLModel.java
+++ /dev/null
@@ -1,69 +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.consumption.datamodel.wsdlmodel;
-
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-public class StubbedWSDLModel
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- protected Model fModel;
- public StubbedWSDLModel()
- {
- WSDLElement wsdlElement = new WSDLElement("WSDLFiles");
- fModel = wsdlElement.getModel();
- }
-
- public Model getWSDLModel()
- {
- return fModel;
- }
-
- public void buildModel()
- {
- DefinitionElement def1 = new DefinitionElement((WSDLElement)fModel.getRootElement(),"StockQuote");
- ServiceElement ser1 = new ServiceElement(def1,"getQuote");
- ServiceElement ser2 = new ServiceElement(def1,"setQuote");
- PortElement port1 = new PortElement(ser1,"port1");
- PortElement port2 = new PortElement(ser1,"port2");
- PortElement port3 = new PortElement(ser2,"port1");
- PortElement port4 = new PortElement(ser2,"port2");
- BindingElement bind1 = new BindingElement(port1,"bind1");
- BindingElement bind2 = new BindingElement(port2,"bind1");
- BindingElement bind3 = new BindingElement(port3,"bind1");
- BindingElement bind4 = new BindingElement(port4,"bind1");
- OperationElement op1 = new OperationElement(bind1,"op1");
- new OperationElement(bind2,"op1");
- new OperationElement(bind3,"op1");
- new OperationElement(bind4,"op1");
- MessageElement me1 = new MessageElement(op1,"me1");
- MessageElement me2 = new MessageElement(op1,"me2");
- new PartElement(me1,"pe1");
- new PartElement(me2,"pe2");
-
- DefinitionElement def2 = new DefinitionElement((WSDLElement)fModel.getRootElement(),"TempConversion");
- ServiceElement ser3 = new ServiceElement(def2,"getTemp");
- ServiceElement ser4 = new ServiceElement(def2,"setTemp");
- PortElement port5 = new PortElement(ser3,"port1");
- PortElement port6 = new PortElement(ser4,"port1");
- BindingElement bind5 = new BindingElement(port5,"bind1");
- BindingElement bind6 = new BindingElement(port6,"bind1");
- new OperationElement(bind5,"op1");
- new OperationElement(bind6,"op1");
-
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/WSDLElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/WSDLElement.java
deleted file mode 100644
index 29b145f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/WSDLElement.java
+++ /dev/null
@@ -1,53 +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.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-import org.eclipse.wst.ws.internal.datamodel.BasicModel;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-
-public class WSDLElement extends BasicElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static String REL_DEFINITIONS = "definitions";
-
- /*
- *
- **/
- public WSDLElement (String name)
- {
- this(name,new BasicModel("WSDLModel"));
- }
-
- public WSDLElement (String name, Model model)
- {
- super(name,model);
- model.setRootElement(this);
- }
-
- public Enumeration getDefinitions()
- {
- return getElements(REL_DEFINITIONS);
- }
-
- public int getNumberOfDefinitions()
- {
- return getNumberOfElements(REL_DEFINITIONS);
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreAssemblyFragment.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreAssemblyFragment.java
deleted file mode 100644
index f622aba..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreAssemblyFragment.java
+++ /dev/null
@@ -1,17 +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.consumption.fragments;
-
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-
-public class ClientPreAssemblyFragment extends SequenceFragment
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreDeployFragment.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreDeployFragment.java
deleted file mode 100644
index 3b69fbc..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreDeployFragment.java
+++ /dev/null
@@ -1,17 +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.consumption.fragments;
-
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-
-public class ClientPreDeployFragment extends SequenceFragment
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreDevelopFragment.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreDevelopFragment.java
deleted file mode 100644
index 57fa1ed..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreDevelopFragment.java
+++ /dev/null
@@ -1,17 +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.consumption.fragments;
-
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-
-public class ClientPreDevelopFragment extends SequenceFragment
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreInstallFragment.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreInstallFragment.java
deleted file mode 100644
index 342a2b1..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreInstallFragment.java
+++ /dev/null
@@ -1,17 +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.consumption.fragments;
-
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-
-public class ClientPreInstallFragment extends SequenceFragment
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreAssemblyFragment.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreAssemblyFragment.java
deleted file mode 100644
index 77cef3b..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreAssemblyFragment.java
+++ /dev/null
@@ -1,17 +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.consumption.fragments;
-
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-
-public class ServicePreAssemblyFragment extends SequenceFragment
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreDeployFragment.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreDeployFragment.java
deleted file mode 100644
index 8458f5c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreDeployFragment.java
+++ /dev/null
@@ -1,17 +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.consumption.fragments;
-
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-
-public class ServicePreDeployFragment extends SequenceFragment
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreDevelopFragment.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreDevelopFragment.java
deleted file mode 100644
index ccb4d2f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreDevelopFragment.java
+++ /dev/null
@@ -1,17 +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.consumption.fragments;
-
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-
-public class ServicePreDevelopFragment extends SequenceFragment
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreInstallFragment.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreInstallFragment.java
deleted file mode 100644
index c849245..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreInstallFragment.java
+++ /dev/null
@@ -1,17 +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.consumption.fragments;
-
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-
-public class ServicePreInstallFragment extends SequenceFragment
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/plugin/WebServiceConsumptionPlugin.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/plugin/WebServiceConsumptionPlugin.java
deleted file mode 100644
index 3d4062a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/plugin/WebServiceConsumptionPlugin.java
+++ /dev/null
@@ -1,57 +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 115690 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.plugin;
-
-import org.eclipse.core.runtime.Plugin;
-
-/**
-* This is the plugin class for the Web Services plugin.
-* <p>
-* This plugin contains the bulk of the Web Services runtime.
-* Only the graphical user interface portion of the runtime is
-* found elsewhere - in the org.eclipse.jst.ws.ui plugin.
-*/
-public class WebServiceConsumptionPlugin extends Plugin
-{
- /**
- * The identifier of the descriptor of this plugin in plugin.xml.
- */
- public static final String ID = "org.eclipse.jst.ws.consumption";
-
- /**
- * The reference to the singleton instance of this plugin.
- */
- private static WebServiceConsumptionPlugin instance_;
-
- /**
- * Constructs a runtime plugin object for this plugin.
- */
- public WebServiceConsumptionPlugin ()
- {
- super();
- instance_ = this;
- }
-
- /**
- * Returns the singleton instance of this plugin. Equivalent to calling
- * (WebServiceConsumptionPlugin)Platform.getPlugin("org.eclipse.jst.ws");
- * @return The WebServiceConsumptionPlugin singleton.
- */
- public static WebServiceConsumptionPlugin getInstance ()
- {
- return instance_;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileAttributeGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileAttributeGenerator.java
deleted file mode 100644
index 1225e03..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileAttributeGenerator.java
+++ /dev/null
@@ -1,76 +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
- * -------- -------- -----------------------------------------------------------
- * 20060612 145433 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.sampleapp.codegen;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.TypeVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.AttributeElementType;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-
-
-/**
-* Objects of this class represent a InputFileTypeGenerator.
-* */
-public class InputFileAttributeGenerator extends InputFileTypeGenerator
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- private boolean fStateLess;
-
- /**
- * Constructor.
- *
- */
- public InputFileAttributeGenerator (StringBuffer buffer, int currentLevel, int levelsDeep)
- {
- super(buffer,currentLevel,levelsDeep);
- }
-
-
- /*
- * Takes in an object to be acted upon by this visitor action
- * @param Object The object to be acted upon
- */
- public IStatus visit (Object object)
- {
-
- AttributeElementType attributeElementType = (AttributeElementType)object;
- //if it is a bean is it stateless
- attributeElementType.getTypeElement();
- if(attributeElementType.getSetterMethod() == null) return Status.OK_STATUS;
- if(attributeElementType.getTypeElement().isBean()){
- BeanElement bean = (BeanElement)attributeElementType.getTypeElement();
- fStateLess = bean.isStateLess();
- }
-
- TypeVisitor typeVisitor = new TypeVisitor();
- InputFileTypeGenerator inputFileTypeGenerator = new InputFileTypeGenerator(fbuffer,fCurrentLevel,fLevelsDeep);
- if(attributeElementType.getTypeElement().isBean() && !TypeFactory.recognizedBean(attributeElementType.getTypeElement().getName())
- && !(getReturnParam() && (TypeFactory.isRecognizedReturnType(attributeElementType.getTypeElement().getTypeName()) || fStateLess)))
-
- addParentGetter(attributeElementType.getGetterMethod(),attributeElementType.getTypeElement().getName());
- inputFileTypeGenerator.addParentGetter(returnParentGetter(),returnParentGetterType());
- inputFileTypeGenerator.setInstanceName(fInstanceName);
- inputFileTypeGenerator.setReturnParam(getReturnParam());
- typeVisitor.run(attributeElementType,inputFileTypeGenerator);
- fbuffer = inputFileTypeGenerator.getStringBuffer();
-
- return Status.OK_STATUS;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileGenerator.java
deleted file mode 100644
index 0c170a0..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileGenerator.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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
- * bug 296245 - Yen Lu - yenlu@ca.ibm.com - Input.jsp produces malformed HTML
- * bug 353269 - Ivan Castro Alvarez - JAX-RPC Sample JSP generator should produce Web samples that are not vulnerable to XSS
- *******************************************************************************/
-
-
-package org.eclipse.jst.ws.internal.consumption.sampleapp.codegen;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.MethodVisitor;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a MethodFilegenerator.
-* */
-public class InputFileGenerator extends Generator
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public String fResultName;
-
- /**
- * Constructor.
- * used directly
- */
- public InputFileGenerator (String result)
- {
- super();
- fResultName = result;
- }
-
- /**
- * Constructor.
- * called from subclasses
- */
- public InputFileGenerator (StringBuffer buffer, String result)
- {
- super(buffer);
- fResultName = result;
- }
-
- /**
- * Constructor.
- * called from subclasses
- */
- public InputFileGenerator (StringBuffer buffer)
- {
- super(buffer);
- }
-
- public void setFileNames(String results)
- {
- fResultName = results;
- }
-
- //takes in a bean node
- public IStatus visit (Object object)
- {
- Element beanElement = (Element)object;
- fbuffer.append("<%@page contentType=\"text/html;charset=UTF-8\"%>" + StringUtils.NEWLINE);
- fbuffer.append("<HTML>" + StringUtils.NEWLINE);
- fbuffer.append("<HEAD>" + StringUtils.NEWLINE);
- fbuffer.append("<TITLE>Inputs</TITLE>" + StringUtils.NEWLINE);
- fbuffer.append("</HEAD>" + StringUtils.NEWLINE);
- fbuffer.append("<BODY>" + StringUtils.NEWLINE);
- fbuffer.append("<H1>Inputs</H1>" + StringUtils.NEWLINE + "" + StringUtils.NEWLINE);
- fbuffer.append("<%" + StringUtils.NEWLINE + "String method = request.getParameter(\"method\");" + StringUtils.NEWLINE);
- fbuffer.append("int methodID = 0;" + StringUtils.NEWLINE);
- fbuffer.append("if (method == null) methodID = -1;" + StringUtils.NEWLINE + "" + StringUtils.NEWLINE);
- fbuffer.append("boolean valid = true;" + StringUtils.NEWLINE + StringUtils.NEWLINE);
-
- fbuffer.append("if(methodID != -1) methodID = Integer.parseInt(method);" + StringUtils.NEWLINE);
- fbuffer.append("switch (methodID){ " + StringUtils.NEWLINE);
-
- // go to the next generator
- MethodVisitor methodVisitor = new MethodVisitor();
- InputFileHelp1Generator inputFileHelp1Generator = new InputFileHelp1Generator(fbuffer,fResultName);
- methodVisitor.run(beanElement,inputFileHelp1Generator);
- fbuffer = inputFileHelp1Generator.getStringBuffer();
-
- fbuffer.append("case 1111111111:" + StringUtils.NEWLINE);
- fbuffer.append("valid = false;" + StringUtils.NEWLINE);
- fbuffer.append("%>" + StringUtils.NEWLINE);
- fbuffer.append("<FORM METHOD=\"POST\" ACTION=\"" + fResultName + "\" TARGET=\"result\">" + StringUtils.NEWLINE);
- fbuffer.append("<INPUT TYPE=\"HIDDEN\" NAME=\"method\" VALUE=\"<%=org.eclipse.jst.ws.util.JspUtils.markup(method)%>\">" + StringUtils.NEWLINE);
- fbuffer.append("<TABLE>" + StringUtils.NEWLINE);
- fbuffer.append("<TR>" + StringUtils.NEWLINE);
- fbuffer.append("<TD COLSPAN=\"1\" ALIGN=\"LEFT\">URLString:</TD>" + StringUtils.NEWLINE);
- fbuffer.append("<TD ALIGN=\"left\"><INPUT TYPE=\"TEXT\" NAME=\"url1111111111\" SIZE=20></TD>" + StringUtils.NEWLINE);
- fbuffer.append("</TR>" + StringUtils.NEWLINE);
- fbuffer.append("</TABLE>" + StringUtils.NEWLINE);
- fbuffer.append("<BR>" + StringUtils.NEWLINE);
- fbuffer.append("<INPUT TYPE=\"SUBMIT\" VALUE=\"Invoke\">" + StringUtils.NEWLINE);
- fbuffer.append("<INPUT TYPE=\"RESET\" VALUE=\"Clear\">" + StringUtils.NEWLINE);
- fbuffer.append("</FORM>" + StringUtils.NEWLINE);
- fbuffer.append("<%" + StringUtils.NEWLINE);
- fbuffer.append("break;" + StringUtils.NEWLINE);
- fbuffer.append("case 1111111112:" + StringUtils.NEWLINE);
- fbuffer.append("valid = false;" + StringUtils.NEWLINE);
- fbuffer.append("%>" + StringUtils.NEWLINE);
- fbuffer.append("<FORM METHOD=\"POST\" ACTION=\"" + fResultName + "\" TARGET=\"result\">" + StringUtils.NEWLINE);
- fbuffer.append("<INPUT TYPE=\"HIDDEN\" NAME=\"method\" VALUE=\"<%=org.eclipse.jst.ws.util.JspUtils.markup(method)%>\">" + StringUtils.NEWLINE);
- fbuffer.append("<BR>" + StringUtils.NEWLINE);
- fbuffer.append("<INPUT TYPE=\"SUBMIT\" VALUE=\"Invoke\">" + StringUtils.NEWLINE);
- fbuffer.append("<INPUT TYPE=\"RESET\" VALUE=\"Clear\">" + StringUtils.NEWLINE);
- fbuffer.append("</FORM>" + StringUtils.NEWLINE);
- fbuffer.append("<%" + StringUtils.NEWLINE);
- fbuffer.append("break;" + StringUtils.NEWLINE);
-
-
-
- fbuffer.append("}" + StringUtils.NEWLINE);
- fbuffer.append("if (valid) {" + StringUtils.NEWLINE);
- fbuffer.append("%>" + StringUtils.NEWLINE + "Select a method to test." + StringUtils.NEWLINE);
- fbuffer.append("<%" + StringUtils.NEWLINE);
- fbuffer.append("}" + StringUtils.NEWLINE);
- fbuffer.append("%>").append(StringUtils.NEWLINE).append(StringUtils.NEWLINE);
- fbuffer.append("</BODY>" + StringUtils.NEWLINE);
- fbuffer.append("</HTML>" + StringUtils.NEWLINE);
-
- return Status.OK_STATUS;
-
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileHelp1Generator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileHelp1Generator.java
deleted file mode 100644
index d6043ba..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileHelp1Generator.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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
- * bug 353269 - Ivan Castro Alvarez - JAX-RPC Sample JSP generator should produce Web samples that are not vulnerable to XSS
- *******************************************************************************/
-
-
-package org.eclipse.jst.ws.internal.consumption.sampleapp.codegen;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.ParameterVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.MethodElement;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a InputFileHelp1Generator.
-* */
-public class InputFileHelp1Generator extends InputFileGenerator
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static final int INITIAL_STATE = 1;
- public static final int FINAL_STATE = 2;
-
- public int fstate;
-
- /**
- * Constructor.
- *
- */
- public InputFileHelp1Generator (StringBuffer buffer)
- {
- super(buffer);
- fstate = INITIAL_STATE;
- }
-
- /**
- * Constructor.
- *
- */
- public InputFileHelp1Generator (StringBuffer buffer,String resultName)
- {
- super(buffer,resultName);
- fstate = INITIAL_STATE;
- }
-
- /*
- * Takes in an element
- * @param Object Takes in an object to be acted upon
- */
- public IStatus visit (Object object)
- {
- Element methodElement = (Element)object;
- MethodElement method = (MethodElement)methodElement;
- if (method.getMethodOmmission()) return Status.OK_STATUS;
-
- ParameterVisitor parameterVisitor = new ParameterVisitor();
- fbuffer.append("case " + method.getNumberID()+ ":" + StringUtils.NEWLINE);
- fbuffer.append("valid = false;" + StringUtils.NEWLINE);
- fbuffer.append("%>" + StringUtils.NEWLINE);
- fbuffer.append("<FORM METHOD=\"POST\" ACTION=\"" + fResultName + "\" TARGET=\"result\">" + StringUtils.NEWLINE);
- fbuffer.append("<INPUT TYPE=\"HIDDEN\" NAME=\"method\" VALUE=\"<%=org.eclipse.jst.ws.util.JspUtils.markup(method)%>\">" + StringUtils.NEWLINE);
-
- // go to the next generator
- InputFileHelp2Generator inputFileHelp2Generator = new InputFileHelp2Generator(fbuffer);
- parameterVisitor.run(methodElement,inputFileHelp2Generator);
- fbuffer = inputFileHelp2Generator.getStringBuffer();
-
- fbuffer.append("<BR>" + StringUtils.NEWLINE);
- fbuffer.append("<INPUT TYPE=\"SUBMIT\" VALUE=\"Invoke\">" + StringUtils.NEWLINE);
- fbuffer.append("<INPUT TYPE=\"RESET\" VALUE=\"Clear\">" + StringUtils.NEWLINE);
- fbuffer.append("</FORM>" + StringUtils.NEWLINE);
- fbuffer.append("<%" + StringUtils.NEWLINE);
- fbuffer.append("break;" + StringUtils.NEWLINE);
-
-
- return Status.OK_STATUS;
-
-
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileHelp2Generator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileHelp2Generator.java
deleted file mode 100644
index 2b7e64b..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileHelp2Generator.java
+++ /dev/null
@@ -1,102 +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.consumption.sampleapp.codegen;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.TypeVisitor;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a InputFileHelp2Generator.
-* */
-public class InputFileHelp2Generator extends InputFileHelp1Generator
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /*
- * This is actually used by the result generator to show the
- * resultant Bean
- * The name is the name the resultant bean is using as its instance name
- */
- protected String fInstanceName;
- private boolean fReturnParam=false;
-
- /**
- * Constructor.
- *
- */
- public InputFileHelp2Generator (StringBuffer buffer)
- {
- super(buffer);
- fInstanceName="";
- }
-
- /**
- * This is state data to be used by the generators
- * @param String name The instance name of the parameters type bean
- */
- public void setInstanceName(String name)
- {
- fInstanceName = name;
- }
-
- /**
- * This is state data to be used by the generators
- * @return String name The instance name of the parameters type bean
- */
- public String getInstanceName()
- {
- return fInstanceName;
- }
-
-
- /*
- * Takes in an object to be acted upon by this visitor action
- * @param Object The object to be acted upon
- */
- public IStatus visit (Object object)
- {
- Element parameterElement = (Element)object;
- getVisitor();
-
- fbuffer.append("<TABLE>" + StringUtils.NEWLINE);
-
- TypeVisitor typeVisitor = new TypeVisitor();
- InputFileTypeGenerator inputFileTypeGenerator = new InputFileTypeGenerator(fbuffer,0);
- inputFileTypeGenerator.setReturnParam(getReturnParam());
- inputFileTypeGenerator.setInstanceName(fInstanceName);
- typeVisitor.run(parameterElement,inputFileTypeGenerator);
- fbuffer = inputFileTypeGenerator.getStringBuffer();
-
- fbuffer.append("</TABLE>" + StringUtils.NEWLINE);
-
- return Status.OK_STATUS;
-
- }
-
- public boolean getReturnParam()
- {
- return fReturnParam;
- }
-
- public void setReturnParam(boolean returnParam)
- {
- fReturnParam = returnParam;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileTypeGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileTypeGenerator.java
deleted file mode 100644
index 9b9bf6d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileTypeGenerator.java
+++ /dev/null
@@ -1,304 +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
- * -------- -------- -----------------------------------------------------------
- * 20060612 145433 gilberta@ca.ibm.com - Gilbert Andrews
- * 20070410 180952 makandre@ca.ibm.com - Andrew Mak, Sample JSP generator chokes on interfaces and abstract classes
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.sampleapp.codegen;
-
-import java.util.Vector;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.AttributeVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.FieldVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.AttributeElementType;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.DataType;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.SimpleElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-
-
-/**
-* Objects of this class represent a InputFileTypeGenerator.
-* */
-public class InputFileTypeGenerator extends InputFileHelp2Generator
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- protected String fParentGetters;
- protected int fLevelsDeep;
- protected int fColspan;
- protected int fCurrentLevel;
- private boolean fIsSimple;
- private boolean fStateLessBean;
- private Vector fGetters;
- private Vector fTypes;
- private boolean fWrite = true;
-
- /**
- * Constructor.
- *
- */
- public InputFileTypeGenerator (StringBuffer buffer, int currentLevel)
- {
- super(buffer);
- fCurrentLevel = currentLevel;
- fLevelsDeep = -1;
- fParentGetters = "";
- }
-
- /**
- * Constructor.
- *
- */
- public InputFileTypeGenerator (StringBuffer buffer, int currentLevel,int levelsDeep)
- {
- super(buffer);
- fCurrentLevel = currentLevel;
- fLevelsDeep = levelsDeep;
- fParentGetters = "";
- }
-
- public void setParentGetters(Vector getter,Vector type)
- {
- if(fGetters != null){
- fGetters.clear();
- fTypes.clear();
- }
- addParentGetter(getter,type);
- }
-
-
- /**
- * This function holds some state data that is important in getting the
- * Strings for display of resultant beans
- * @param String getter this is the getter of an attribute
- * The idea is that by the time we get to the simple type
- * we have getAddress().getStreet()....
- */
- public void addParentGetter(String getter, String type)
- {
- if(fGetters == null) fGetters = new Vector();
- if(fTypes == null) fTypes = new Vector();
- fGetters.addElement(getter);
- fTypes.addElement(type);
- }
-
- /*
- * this will be used when passing between two visitors
- *
- */
- public void addParentGetter(Vector getters, Vector types)
- {
- if(fGetters == null) fGetters = new Vector();
- if(fTypes == null) fTypes = new Vector();
- int size = getters.size();
- for(int i = 0; i<size; i++){
- fGetters.addElement(getters.get(i));
- fTypes.addElement(types.get(i));
- }
- }
-
- protected String returnParentGetter(int count)
- {
- if (fGetters == null || count > fGetters.size()) return null;
- return (String)fGetters.get(count);
- }
-
- protected String returnParentGetterType(int count)
- {
- if (fTypes == null || count > fTypes.size()) return null;
- return (String)fTypes.get(count);
- }
-
- protected Vector returnParentGetter()
- {
- if (fGetters == null ) return new Vector();
- return fGetters;
- }
-
- protected Vector returnParentGetterType()
- {
- if (fTypes == null ) return new Vector();
- return fTypes;
- }
-
- protected int getterCount()
- {
- if(fGetters == null) return 0;
- return fGetters.size();
- }
-
-
- /**
- * This function returns some state data that is important in getting the
- * Strings for display of resultant beans
- * @return String the string of getters to this point
- * The idea is that by the time we get to the simple type
- * we have getAddress().getStreet()....
- */
- public String getParentGetters()
- {
- return fParentGetters;
- }
-
- /*
- * Takes in an object to be acted upon by this visitor action
- * @param Object The object to be acted upon
- */
- public IStatus visit (Object object)
- {
- TypeElement element = (TypeElement)object;
-
- if (Boolean.TRUE.equals(element.getPropertyAsObject(TypeElement.NON_INSTANTIABLE)))
- return Status.OK_STATUS;
-
- if (element instanceof SimpleElement) fIsSimple = true;
- else fIsSimple = false;
-
- //this could be a statelessbean need to know
- if (element instanceof BeanElement ){
- BeanElement bean = (BeanElement)element;
- if (bean.isStateLess()) fStateLessBean = true;
- if (bean.getAttrib() == BeanElement.READONLY) fWrite = false;
- }
-
-
-
- //Complex type support
- //first I need to find out how many levels deep
- if(fLevelsDeep == -1){
- AttributeVisitor attributeVisitor = new AttributeVisitor();
- LevelsDeepVisitorAction ldva = new LevelsDeepVisitorAction();
- attributeVisitor.run(element,ldva);
- fLevelsDeep = ldva.getLevelsDeep();
- //check out the fields
- FieldVisitor fieldVisitor = new FieldVisitor();
- LevelsDeepVisitorAction ldva2 = new LevelsDeepVisitorAction();
- fieldVisitor.run(element,ldva2);
-
- if(fLevelsDeep < ldva2.getLevelsDeep())fLevelsDeep = ldva2.getLevelsDeep();
- fLevelsDeep++;
- }
- fColspan = fLevelsDeep - fCurrentLevel;
-
- //if we have a return param with no getter make sure we are on the
- //attribute and not the parameter then return
- if(getReturnParam() && element.getOwningElement() instanceof AttributeElementType &&(((AttributeElementType)element.getOwningElement()).getGetterMethod() == null) ) return Status.OK_STATUS;
-
- //Code gen for all elements
- if(fWrite){
- fbuffer.append("<TR>" + StringUtils.NEWLINE);
- for (int i = 0; i < fCurrentLevel;i++){
- fbuffer.append("<TD WIDTH=\"5%\"></TD>" + StringUtils.NEWLINE);
- }
- fbuffer.append("<TD COLSPAN=\"" + fColspan + "\" ALIGN=\"LEFT\">" + element.getOwningElement().getName() + ":</TD>" + StringUtils.NEWLINE);
- }
- if(fIsSimple || TypeFactory.recognizedBean(element.getName())
- || (getReturnParam() && fStateLessBean)
- || (getReturnParam() && TypeFactory.isRecognizedReturnType(element.getTypeName()))){
- if(getInstanceName().equals("")){
- if(fWrite){
- DataType dataType = TypeFactory.createType(element.getName(),element.getOwningElement().getMUID());
- fbuffer.append(dataType.inputForm(element.getOwningElement().getMUID()));
- }
- }
- else{
- if(getReturnParam() && (TypeFactory.isRecognizedReturnType(element.getTypeName()) || fStateLessBean)){
- DataType dataType = TypeFactory.createType(element.getTypeName(),element.getOwningElement().getMUID());
- String uniqueName = "type" + dataType.getUniqueName();
- fbuffer.append("<TD>" + StringUtils.NEWLINE);
- fbuffer.append("<%" + StringUtils.NEWLINE);
- fbuffer.append("if(" + getInstanceName() + " != null){" + StringUtils.NEWLINE);
- String afterString = getInstanceName();
- String tmpString = "tebece";
- String prevString = getInstanceName();
- String newTmpString = "";
- for(int i=0;i<getterCount();i++){
- newTmpString = tmpString + i;
- fbuffer.append(returnParentGetterType(i) + " " + newTmpString + "=" + prevString + "." + returnParentGetter(i) + ";" + StringUtils.NEWLINE);
- prevString = newTmpString;
- fbuffer.append("if(" + newTmpString + " != null){" + StringUtils.NEWLINE);
- afterString = newTmpString;
- }
- fbuffer.append(element.getName() + " " + uniqueName + " = " + afterString + "." + ((AttributeElementType)element.getOwningElement()).getGetterMethod()+ ";" + StringUtils.NEWLINE);
- fbuffer.append(dataType.TypeConversion(uniqueName));
- for(int i=0;i<getterCount();i++){
- fbuffer.append("}");
- }
- fbuffer.append("}%>" + StringUtils.NEWLINE);
- fbuffer.append("</TD>" + StringUtils.NEWLINE);
- }
-
- else{
- fbuffer.append("<TD>" + StringUtils.NEWLINE);
- fbuffer.append("<%" + StringUtils.NEWLINE);
- fbuffer.append("if(" + getInstanceName() + " != null){" + StringUtils.NEWLINE);
- String afterString = getInstanceName();
- String tmpString = "tebece";
- String prevString = getInstanceName();
- String newTmpString = "";
- for(int i=0;i<getterCount();i++){
- newTmpString = tmpString + i;
- fbuffer.append(returnParentGetterType(i) + " " + newTmpString + "=" + prevString + "." + returnParentGetter(i) + ";" + StringUtils.NEWLINE);
- prevString = newTmpString;
- fbuffer.append("if(" + newTmpString + " != null){" + StringUtils.NEWLINE);
- afterString = newTmpString;
- }
- fbuffer.append("%>" + StringUtils.NEWLINE);
- fbuffer.append("<%=");
- fbuffer.append(afterString + "." + ((AttributeElementType)element.getOwningElement()).getGetterMethod()+ StringUtils.NEWLINE);
- fbuffer.append("%>");
- fbuffer.append("<%");
- for(int i=0;i<getterCount();i++){
- fbuffer.append("}");
- }
- fbuffer.append("}%>" + StringUtils.NEWLINE);
- fbuffer.append("</TD>" + StringUtils.NEWLINE);
- }
- }
-
- }
-
- //Now carry on down the rest of the bean
- else {
- AttributeVisitor attributeVisitor = new AttributeVisitor();
- attributeVisitor.setResidentVector1(returnParentGetter());
- attributeVisitor.setResidentVector2(returnParentGetterType());
- InputFileAttributeGenerator inputFileAttributeGenerator = new InputFileAttributeGenerator(fbuffer,(fCurrentLevel + 1),fLevelsDeep);
- inputFileAttributeGenerator.setReturnParam(getReturnParam());
- inputFileAttributeGenerator.setInstanceName(fInstanceName);
- attributeVisitor.run(element,inputFileAttributeGenerator);
- fbuffer = inputFileAttributeGenerator.getStringBuffer();
-
- //now do fields very similar
- FieldVisitor fieldVisitor = new FieldVisitor();
- fieldVisitor.setResidentVector1(returnParentGetter());
- fieldVisitor.setResidentVector2(returnParentGetterType());
- InputFileAttributeGenerator inputFileAttributeGenerator2 = new InputFileAttributeGenerator(fbuffer,(fCurrentLevel + 1),fLevelsDeep);
- inputFileAttributeGenerator2.setReturnParam(getReturnParam());
- inputFileAttributeGenerator2.setInstanceName(fInstanceName);
- fieldVisitor.run(element,inputFileAttributeGenerator2);
- fbuffer = inputFileAttributeGenerator2.getStringBuffer();
-
-
-
- }
-
-
- return Status.OK_STATUS;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/LevelsDeepVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/LevelsDeepVisitorAction.java
deleted file mode 100644
index 2f2e1a9..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/LevelsDeepVisitorAction.java
+++ /dev/null
@@ -1,119 +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.consumption.sampleapp.codegen;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.AttributeVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.FieldVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.TypeVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.AttributeElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a LevelsDeepVisitorAction.
-* */
-public class LevelsDeepVisitorAction implements VisitorAction
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- private int fLevelsDeep;
- private int fDeepestLevel;
-
- /**
- * Constructor.
- * This is the starting point
- *
- */
- public LevelsDeepVisitorAction ()
- {
- fLevelsDeep = 0;
- }
-
- /**
- * Constructor.
- * This is the starting point
- *
- */
- public LevelsDeepVisitorAction (int current,boolean increment)
- {
- fLevelsDeep = current;
- if(increment) fLevelsDeep++;
- fDeepestLevel = fLevelsDeep;
- }
-
- public void initialize(String resident)
- {
- //nothing to be done but must be implemented
- }
-
-
-
- /**
- * The visitor that called this VisitorAction
- * @param visitor the visitor that called this visitor action
- */
- public void setVisitor(Visitor visitor)
- {
- }
-
-
- /**
- * Returns the level of nesting within this bean
- * @return int returns the int number representing the number of nests of this bean
- */
- public int getLevelsDeep()
- {
- return fDeepestLevel;
- }
-
-
- /**
- * Takes in an object to be acted upon by this visitor action
- * @param Object The object to be acted upon
- */
- public IStatus visit (Object object)
- {
- Element element = (Element)object;
- if (element instanceof AttributeElement || element instanceof TypeElement){
- TypeVisitor typeVisitor = new TypeVisitor();
- LevelsDeepVisitorAction lvda = new LevelsDeepVisitorAction(fLevelsDeep,true);
- typeVisitor.run(element,lvda);
-
- if (lvda.getLevelsDeep() > fDeepestLevel) fDeepestLevel = lvda.getLevelsDeep();
-
- }
- else if (element instanceof BeanElement && !(TypeFactory.recognizedBean(element.getName()))){
- AttributeVisitor attributeVisitor = new AttributeVisitor();
- LevelsDeepVisitorAction lvda = new LevelsDeepVisitorAction(fLevelsDeep,false);
- attributeVisitor.run(element,lvda);
- if (lvda.getLevelsDeep() > fDeepestLevel) fDeepestLevel = lvda.getLevelsDeep();
-
- FieldVisitor fieldVisitor = new FieldVisitor();
- LevelsDeepVisitorAction lvda2 = new LevelsDeepVisitorAction(fLevelsDeep,false);
- fieldVisitor.run(element,lvda2);
- if (lvda2.getLevelsDeep() > fDeepestLevel) fDeepestLevel = lvda2.getLevelsDeep();
-
- }
-
- return Status.OK_STATUS;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/MethodFileGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/MethodFileGenerator.java
deleted file mode 100644
index caec50e..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/MethodFileGenerator.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.sampleapp.codegen;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.MethodVisitor;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a MethodFilegenerator.
-* */
-public class MethodFileGenerator extends Generator
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public String fInputName;
- /**
- * Constructor.
- *
- */
- public MethodFileGenerator (String inputs)
- {
- super();
- fInputName = inputs;
- }
-
- /**
- * Constructor.
- * @param StringBuffer buffer to append codegen
- */
- public MethodFileGenerator (StringBuffer buffer,String inputs)
- {
- super(buffer);
- fInputName = inputs;
- }
-
-
- public void setFileNames(String inputs)
- {
- fInputName = inputs;
- }
-
- //public static String LOCATOR = "Locator";
- public static String BEAN = "Proxy";
- public static String GET = "get";
-
-
- //takes in a bean node
- public IStatus visit (Object object)
- {
- Element beanElement = (Element)object;
- fbuffer.append("<%@page contentType=\"text/html;charset=UTF-8\"%>");
- fbuffer.append("<HTML>" + StringUtils.NEWLINE + "<HEAD>" + StringUtils.NEWLINE + "<TITLE>Methods</TITLE>" + StringUtils.NEWLINE + "</HEAD>" + StringUtils.NEWLINE + "<BODY>" + StringUtils.NEWLINE + "<H1>Methods</H1>" + StringUtils.NEWLINE + "<UL>" + StringUtils.NEWLINE);
- MethodVisitor methodVisitor = new MethodVisitor();
- MethodFileHelpGenerator methodFileHelpGenerator = new MethodFileHelpGenerator(fbuffer,fInputName);
- methodVisitor.run(beanElement,methodFileHelpGenerator);
- fbuffer = methodFileHelpGenerator.getStringBuffer();
- fbuffer.append("</UL>" + StringUtils.NEWLINE + "</BODY>" + StringUtils.NEWLINE + "</HTML>");
-
- return Status.OK_STATUS;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/MethodFileHelpGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/MethodFileHelpGenerator.java
deleted file mode 100644
index d5d0b75..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/MethodFileHelpGenerator.java
+++ /dev/null
@@ -1,56 +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.consumption.sampleapp.codegen;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.MethodElement;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a MethodFilegenerator.
-* */
-public class MethodFileHelpGenerator extends MethodFileGenerator
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- * Constructor.
- *
- */
- public MethodFileHelpGenerator (StringBuffer buffer,String inputName)
- {
- super(buffer,inputName);
- }
-
-
- //takes in a Method node
- public IStatus visit (Object object)
- {
- Element methodElement = (Element)object;
- MethodElement method = (MethodElement)methodElement;
- if (method.getMethodOmmission()) return Status.OK_STATUS;
-
- fbuffer.append("<LI><A HREF=\"" + fInputName + "?method=" + method.getNumberID());
- fbuffer.append("\" TARGET=\"inputs\"> " + method.getDisplayName());
- fbuffer.append("</A></LI>" + StringUtils.NEWLINE);
-
- return Status.OK_STATUS;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileAttributeGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileAttributeGenerator.java
deleted file mode 100644
index d1866f4..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileAttributeGenerator.java
+++ /dev/null
@@ -1,92 +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
- * -------- -------- -----------------------------------------------------------
- * 20060612 145433 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.sampleapp.codegen;
-
-import java.util.Vector;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.TypeVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.AttributeElementType;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.DataType;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-/**
-* Objects of this class represent a ResultFileAttributeGenerator.
-* */
-public class ResultFileAttributeGenerator extends ResultFileHelp2Generator
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- private Vector fSetterVector;
-
- /**
- * Constructor.
- * @param buffer StringBuffer object that this code generator writes to
- */
- public ResultFileAttributeGenerator (StringBuffer buffer)
- {
- super(buffer);
-
- }
-
- /**
- * Setter vector
- */
- public Vector getSetterVector()
- {
- return fSetterVector;
- }
-
-
- /**
- * Visit Method generates code for this Visitor
- * @param Parameter parameter code will be generated
- */
- public IStatus visit (Object object)
- {
- AttributeElementType attributeElementType = (AttributeElementType)object;
- if(attributeElementType.getSetterMethod() == null) return Status.OK_STATUS;
- BasicElement element = (BasicElement)object;
- if(attributeElementType.getTypeElement().isSimple() || TypeFactory.recognizedBean(attributeElementType.getTypeElement().getName())){
- //start the codegen
- //ask the datatype for its request line, it may need mark up or not.
- //ie For the simple types we need the mark up
- //for the dom element we cant use it.
- DataType dataType = TypeFactory.createType(attributeElementType.getTypeElement().getName(),element.getMUID());
- setTypeOwnerId(idName(element.getName()));
- fbuffer.append(dataType.getRequestCode(element.getMUID(),getTypeOwnerId()));
-
- }
-
- TypeVisitor typeVisitor = new TypeVisitor();
- ResultFileTypeGenerator resultFileTypeGenerator = new ResultFileTypeGenerator(fbuffer);
- resultFileTypeGenerator.setNumberFactory(getNumberFactory());
- resultFileTypeGenerator.setTypeOwnerId(getTypeOwnerId());
-
- typeVisitor.run(attributeElementType,resultFileTypeGenerator);
- setNumberFactory(resultFileTypeGenerator.getNumberFactory());
- Vector setterInputs = resultFileTypeGenerator.getResidentVector();
- putResidentVector(attributeElementType.getSetterSignature((String)setterInputs.firstElement()));
-
- return Status.OK_STATUS;
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileGenerator.java
deleted file mode 100644
index 71d5e5a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileGenerator.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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
- * -------- -------- -----------------------------------------------------------
- * 20060523 142296 gilberta@ca.ibm.com - Gilbert Andrews
- * 20110829 355865 ivanc@mx1.ibm.com - Ivan Castro Alvarez, JAX-RPC sample generator still vulnerable to cross site scripting (XSS)
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.sampleapp.codegen;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.MethodVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanElement;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a MethodFilegenerator.
-* */
-public class ResultFileGenerator extends Generator
-{
- public static String TRIPLE_TAB = Generator.DOUBLE_TAB + Generator.TAB;
- public static String QUAD_TAB = Generator.DOUBLE_TAB + Generator.DOUBLE_TAB;
-
- private String setEndpointMethod;
-
- /**
- * Constructor.
- *
- */
- public ResultFileGenerator ()
- {
- super();
- }
-
- /**
- * Constructor.
- *
- */
- public ResultFileGenerator (StringBuffer buffer)
- {
- super(buffer);
- }
-
- //takes in a bean node
- public IStatus visit (Object object)
- {
- Element beanElement = (Element)object;
- BeanElement bean = (BeanElement)beanElement;
- fbuffer.append("<%@page contentType=\"text/html;charset=UTF-8\"%>"+ StringUtils.NEWLINE);
- fbuffer.append("<% request.setCharacterEncoding(\"UTF-8\"); %>"+ StringUtils.NEWLINE);
- fbuffer.append("<HTML>" + StringUtils.NEWLINE);
- fbuffer.append("<HEAD>" + StringUtils.NEWLINE);
- fbuffer.append("<TITLE>Result</TITLE>" + StringUtils.NEWLINE);
- fbuffer.append("</HEAD>" + StringUtils.NEWLINE);
- fbuffer.append("<BODY>" + StringUtils.NEWLINE);
- fbuffer.append("<H1>Result</H1>" + StringUtils.NEWLINE + StringUtils.NEWLINE);
-
- fbuffer.append("<jsp:useBean id=\""+ getSessionBeanId() + "\" scope=\"session\" class=\"");
- fbuffer.append(bean.getName() + "\" />" + StringUtils.NEWLINE);
- if (setEndpointMethod != null && setEndpointMethod.length() > 0)
- {
- fbuffer.append("<%");
- fbuffer.append(StringUtils.NEWLINE);
- fbuffer.append("if (request.getParameter(\"endpoint\") != null && request.getParameter(\"endpoint\").length() > 0)");
- fbuffer.append(StringUtils.NEWLINE);
- fbuffer.append(getSessionBeanId());
- fbuffer.append(".");
- int index = setEndpointMethod.indexOf('?');
- if (index != -1)
- {
- fbuffer.append(setEndpointMethod.substring(0, index));
- fbuffer.append("(new ");
- fbuffer.append(setEndpointMethod.substring(index+1, setEndpointMethod.length()));
- fbuffer.append("(request.getParameter(\"endpoint\")));");
- }
- else
- {
- fbuffer.append(setEndpointMethod);
- fbuffer.append("(request.getParameter(\"endpoint\"));");
- }
- fbuffer.append(StringUtils.NEWLINE);
- fbuffer.append("%>");
- fbuffer.append(StringUtils.NEWLINE);
- }
- fbuffer.append(StringUtils.NEWLINE);
-
- //carry on with regular gorp
- fbuffer.append("<%" + StringUtils.NEWLINE);
- fbuffer.append("String method = request.getParameter(\"method\");" + StringUtils.NEWLINE);
- fbuffer.append("int methodID = 0;" + StringUtils.NEWLINE);
- fbuffer.append("if (method == null) methodID = -1;" + StringUtils.NEWLINE + "" + StringUtils.NEWLINE);
- fbuffer.append("if(methodID != -1) methodID = Integer.parseInt(method);" + StringUtils.NEWLINE);
- fbuffer.append("boolean gotMethod = false;" + StringUtils.NEWLINE + StringUtils.NEWLINE);
-
- fbuffer.append("try {" + StringUtils.NEWLINE);
- fbuffer.append("switch (methodID){ " + StringUtils.NEWLINE);
-
- // go to the next generator
- MethodVisitor methodVisitor = new MethodVisitor();
- ResultFileHelp1Generator resultFileHelp1Generator = new ResultFileHelp1Generator(fbuffer);
- resultFileHelp1Generator.setNumberFactory(getNumberFactory());
- resultFileHelp1Generator.setClientFolderPath(getClientFolderPath());
- methodVisitor.run(beanElement,resultFileHelp1Generator);
- setNumberFactory(resultFileHelp1Generator.getNumberFactory());
-
- fbuffer = resultFileHelp1Generator.getStringBuffer();
-
- fbuffer.append("}" + StringUtils.NEWLINE);
- fbuffer.append("} catch (Exception e) { " + StringUtils.NEWLINE);
- fbuffer.append("%>" + StringUtils.NEWLINE);
- fbuffer.append("Exception: <%= org.eclipse.jst.ws.util.JspUtils.markup(e.toString()) %>" + StringUtils.NEWLINE);
- fbuffer.append("Message: <%= org.eclipse.jst.ws.util.JspUtils.markup(e.getMessage()) %>" + StringUtils.NEWLINE);
- fbuffer.append("<%" + StringUtils.NEWLINE);
- fbuffer.append("return;" + StringUtils.NEWLINE);
- fbuffer.append("}" + StringUtils.NEWLINE);
- fbuffer.append("if(!gotMethod){" + StringUtils.NEWLINE);
- fbuffer.append("%>" + StringUtils.NEWLINE);
- fbuffer.append("result: N/A" + StringUtils.NEWLINE);
- fbuffer.append("<%" + StringUtils.NEWLINE);
- fbuffer.append("}" + StringUtils.NEWLINE);
- fbuffer.append("%>" + StringUtils.NEWLINE);
- fbuffer.append("</BODY>" + StringUtils.NEWLINE);
- fbuffer.append("</HTML>");
-
- return Status.OK_STATUS;
- }
-
- /**
- * @param setEndpointMethod The setEndpointMethod to set.
- */
- public void setSetEndpointMethod(String setEndpointMethod)
- {
- this.setEndpointMethod = setEndpointMethod;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileHelp1Generator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileHelp1Generator.java
deleted file mode 100644
index a1677f7..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileHelp1Generator.java
+++ /dev/null
@@ -1,148 +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.consumption.sampleapp.codegen;
-
-import java.util.Enumeration;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.ParameterVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.ReturnParameterVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.DataType;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.MethodElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a ResultFilegenerator.
-* */
-public class ResultFileHelp1Generator extends ResultFileGenerator
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static final int INITIAL_STATE = 1;
- public static final int FINAL_STATE = 2;
- public static final String MTEMP = "mtemp";
- public static String BEAN = "Proxy";
-
- /**
- * Constructor.
- * @param buffer StringBuffer object that this code generator writes to
- */
- public ResultFileHelp1Generator (StringBuffer buffer)
- {
- super(buffer);
- }
-
- /**
- * Visit Method generates code for this Visitor
- * @param method method code will be generated for
- */
- public IStatus visit (Object object)
- {
- Element methodElement = (Element)object;
-
-
- MethodElement method = (MethodElement)methodElement;
- if (method.getMethodOmmission()) return Status.OK_STATUS;
-
- fbuffer.append("case " + method.getNumberID()+ ":" + StringUtils.NEWLINE);
- visitHelper(method);
-
- fbuffer.append("break;" + StringUtils.NEWLINE);
-
- return Status.OK_STATUS;
- }
- /**
- * Helps out the visitor
- * @param method method code will be generated for
- */
- public void visitHelper (Element methodElement)
- {
-
- fbuffer.append(Generator.DOUBLE_TAB + "gotMethod = true;" + StringUtils.NEWLINE);
-
- MethodElement method = (MethodElement)methodElement;
- // go to the next generator
- ResultFileHelp2Generator resultFileHelp2Generator = new ResultFileHelp2Generator(fbuffer);
- resultFileHelp2Generator.setNumberFactory(getNumberFactory());
- ParameterVisitor parameterVisitor = new ParameterVisitor();
- parameterVisitor.run(methodElement,resultFileHelp2Generator);
- fbuffer = resultFileHelp2Generator.getStringBuffer();
- setNumberFactory(resultFileHelp2Generator.getNumberFactory());
- // we must now grab the state data from the resident vector
- setResidentVector(resultFileHelp2Generator.getResidentVector());
-
-
- //there is no return type if void occurs
-
-
- if (method.getReturnParameterElement().getTypeElement().getName().equals("void"))
- fbuffer.append(Generator.DOUBLE_TAB + getSessionBeanId() + "." +method.getName() + "(");
-
- else{
- fbuffer.append(Generator.DOUBLE_TAB + method.getReturnParameterElement().getTypeElement().getName() + Generator.SPACE + method.getMUID() + MTEMP + Generator.SPACE);
- fbuffer.append("=" + Generator.SPACE + getSessionBeanId() + "." + method.getName() + "(");
- }
-
- Enumeration e = fResidentVector.elements();
- while (e.hasMoreElements()){
- fbuffer.append((String)e.nextElement());
- if (e.hasMoreElements())
- fbuffer.append(",");
- }
- fbuffer.append(");" + StringUtils.NEWLINE);
- if (!method.getReturnParameterElement().getTypeElement().getName().equals("void") && !method.getReturnParameterElement().getTypeElement().isPrimitive()){
- //in case our result is null
- fbuffer.append("if(" + method.getMUID() + "mtemp == null){" + StringUtils.NEWLINE);
- fbuffer.append("%>" + StringUtils.NEWLINE);
- fbuffer.append("<%=" + method.getMUID() + "mtemp %>" + StringUtils.NEWLINE);
- fbuffer.append("<%" + StringUtils.NEWLINE);
- fbuffer.append("}else{" + StringUtils.NEWLINE);
- }
-
- //now lets display the return bean
- // if it is simple we dont need to use the generator
-
- if (!method.getReturnParameterElement().getTypeElement().getName().equals("void")){
- if (method.getReturnParameterElement().getTypeElement().isSimple()
- || TypeFactory.recognizedBean(method.getReturnParameterElement().getTypeElement().getName())
- || TypeFactory.isStateLessBean(method.getReturnParameterElement().getTypeElement().getTypeName())
- || TypeFactory.isRecognizedReturnType(method.getReturnParameterElement().getTypeElement().getTypeName())){
- DataType dataType = TypeFactory.createType(method.getReturnParameterElement().getTypeElement().getTypeName(),method.getReturnParameterElement().getMUID());
- fbuffer.append(dataType.TypeConversion(method.getMUID() + MTEMP));
- }
- else{
- fbuffer.append("%>" + StringUtils.NEWLINE);
- InputFileHelp2Generator inputFileHelp2Generator = new InputFileHelp2Generator(fbuffer);
- inputFileHelp2Generator.setInstanceName(method.getMUID() + MTEMP);
- inputFileHelp2Generator.setReturnParam(true);
- ReturnParameterVisitor returnParameterVisitor = new ReturnParameterVisitor();
- returnParameterVisitor.run(method,inputFileHelp2Generator);
- fbuffer = inputFileHelp2Generator.getStringBuffer();
- fbuffer.append("<%" + StringUtils.NEWLINE);
-
- }
- }
-
- if (!method.getReturnParameterElement().getTypeElement().getName().equals("void") && !method.getReturnParameterElement().getTypeElement().isPrimitive()) fbuffer.append("}" + StringUtils.NEWLINE);
-
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileHelp2Generator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileHelp2Generator.java
deleted file mode 100644
index b122807..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileHelp2Generator.java
+++ /dev/null
@@ -1,100 +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.consumption.sampleapp.codegen;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.TypeVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.DataType;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.ParameterElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-
-/**
-* Objects of this class represent a ResultFileHelp2generator.
-* */
-public class ResultFileHelp2Generator extends Generator
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- private String fTypeOwnerId;
-
-
- /**
- * Constructor.
- * @param buffer StringBuffer object that this code generator writes to
- */
- public ResultFileHelp2Generator (StringBuffer buffer)
- {
- super(buffer);
-
- }
-
- /**
- * Visit Method generates code for this Visitor
- * @param Parameter parameter code will be generated
- */
- public IStatus visit (Object object)
- {
-
-
- ParameterElement parameterElement = (ParameterElement)object;
- parameterElement.getTypeElement();
- if(parameterElement.getTypeElement().isSimple() || TypeFactory.recognizedBean(parameterElement.getTypeElement().getName())){
- //start the codegen
- //ask the datatype for its request line, it may need mark up or not.
- //ie For the simple types we need the mark up
- //for the dom element we cant use it.
- DataType dataType = TypeFactory.createType(parameterElement.getTypeElement().getName(),parameterElement.getMUID());
- setTypeOwnerId(idName(parameterElement.getName()));
- fbuffer.append(dataType.getRequestCode(parameterElement.getMUID(),getTypeOwnerId()));
- }
-
- //visit the type generator
- ResultFileTypeGenerator resultFileTypeGenerator = new ResultFileTypeGenerator(fbuffer);
- resultFileTypeGenerator.setNumberFactory(getNumberFactory());
- resultFileTypeGenerator.setTypeOwnerId(getTypeOwnerId());
- TypeVisitor TypeVisitor = new TypeVisitor();
- TypeVisitor.run(parameterElement,resultFileTypeGenerator);
- fbuffer = resultFileTypeGenerator.getStringBuffer();
- setNumberFactory(resultFileTypeGenerator.getNumberFactory());
- String name = (String)resultFileTypeGenerator.getResidentVector().firstElement();
- putResidentVector(name);
-
- return Status.OK_STATUS;
- }
-
-
- public String getTypeOwnerId()
- {
- if (fTypeOwnerId == null) fTypeOwnerId = "";
- return fTypeOwnerId;
- }
-
- public void setTypeOwnerId(String name)
- {
- fTypeOwnerId = name;
- }
-
- public String idName(String name)
- {
-
- String uniqueNum = String.valueOf(getUniqueNumber());
- String newName = name.replace('.','1') + "_" +uniqueNum + "id";
- return newName;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileTypeGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileTypeGenerator.java
deleted file mode 100644
index d60d897..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileTypeGenerator.java
+++ /dev/null
@@ -1,128 +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
- * -------- -------- -----------------------------------------------------------
- * 20070410 180952 makandre@ca.ibm.com - Andrew Mak, Sample JSP generator chokes on interfaces and abstract classes
- * 20071110 209087 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.sampleapp.codegen;
-
-import java.util.Enumeration;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.AttributeVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.FieldVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.DataType;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-/**
-* Objects of this class represent a ResultFileHelp2generator.
-* */
-public class ResultFileTypeGenerator extends ResultFileHelp2Generator
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-
- public String fTypeIdName;
-
- /**
- * Constructor.
- * @param buffer StringBuffer object that this code generator writes to
- */
- public ResultFileTypeGenerator (StringBuffer buffer)
- {
- super(buffer);
- }
-
- /**
- * Visit Method generates code for this Visitor
- * @param Parameter parameter code will be generated
- */
- public IStatus visit (Object object)
- {
- Element typeElement = (Element)object;
- TypeElement type = (TypeElement)typeElement;
- // right now we only have simple to worry about
- if(type.isSimple() || TypeFactory.recognizedBean(type.getName())){
- // create the type that represents the simple type name
- DataType dataType = TypeFactory.createType(type.getName(),type.getOwningElement().getMUID());
-
- String nodeName = getTypeOwnerId()+ "Temp";
- if(!type.isPrimitive()){
-
- fbuffer.append(Generator.DOUBLE_TAB + Generator.TAB + type.getName() + " " + nodeName + " = null;" + StringUtils.NEWLINE);
- fbuffer.append(Generator.DOUBLE_TAB + "if(!" + getTypeOwnerId() + ".equals(\"\")){" + StringUtils.NEWLINE);
- fbuffer.append(dataType.stringConversion("",nodeName,getTypeOwnerId()));
- fbuffer.append(Generator.DOUBLE_TAB + "}" + StringUtils.NEWLINE);
- }
- else
- fbuffer.append(dataType.stringConversion(type.getName(),nodeName,getTypeOwnerId()));
-
- putResidentVector(nodeName);
- }
-
- else {
- //must be complex
- String typeName = typeElement.getName();
- fTypeIdName = idName(typeName);
-
- if (!Boolean.TRUE.equals(typeElement.getPropertyAsObject(TypeElement.NON_INSTANTIABLE))) {
-
- AttributeVisitor attributeVisitor = new AttributeVisitor();
- ResultFileAttributeGenerator resultFileAttributeGenerator = new ResultFileAttributeGenerator(fbuffer);
- resultFileAttributeGenerator.setNumberFactory(getNumberFactory());
- attributeVisitor.run(typeElement,resultFileAttributeGenerator);
- setNumberFactory(resultFileAttributeGenerator.getNumberFactory());
- fbuffer = resultFileAttributeGenerator.getStringBuffer();
-
- FieldVisitor fieldVisitor = new FieldVisitor();
- ResultFileAttributeGenerator resultFileAttributeGenerator2 = new ResultFileAttributeGenerator(fbuffer);
- resultFileAttributeGenerator2.setNumberFactory(getNumberFactory());
- fieldVisitor.run(typeElement,resultFileAttributeGenerator2);
- setNumberFactory(resultFileAttributeGenerator2.getNumberFactory());
- fbuffer = resultFileAttributeGenerator2.getStringBuffer();
-
-
- fbuffer.append(Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE);
- fbuffer.append(Generator.DOUBLE_TAB + "<jsp:useBean id=\"" + fTypeIdName + "\" scope=\"session\" class=\"" + typeName + "\" />" + StringUtils.NEWLINE);
- fbuffer.append(Generator.DOUBLE_TAB + "<%" + StringUtils.NEWLINE);
-
- Enumeration e = resultFileAttributeGenerator.getResidentVector().elements();
- while(e.hasMoreElements()){
- fbuffer.append(Generator.DOUBLE_TAB + fTypeIdName + "." + e.nextElement() + StringUtils.NEWLINE);
- }
-
- Enumeration e2 = resultFileAttributeGenerator2.getResidentVector().elements();
- while(e2.hasMoreElements()){
- fbuffer.append(Generator.DOUBLE_TAB + fTypeIdName + "." + e2.nextElement() + StringUtils.NEWLINE);
- }
- }
- else
- fbuffer.append(Generator.DOUBLE_TAB + typeName + " " + fTypeIdName + " = null;"+ StringUtils.NEWLINE);
-
- putResidentVector(fTypeIdName);
- //end of changes
-
- }
-
- return Status.OK_STATUS;
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/TestClientFileGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/TestClientFileGenerator.java
deleted file mode 100644
index b76d70c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/TestClientFileGenerator.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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
- * bug 353269 - Ivan Castro Alvarez - JAX-RPC Sample JSP generator should produce Web samples that are not vulnerable to XSS
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.sampleapp.codegen;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* Objects of this class represent a TestClientFilegenerator.
-* */
-public class TestClientFileGenerator extends Generator
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public String fMethodName;
- public String fInputName;
- public String fResultName;
-
- /**
- * Constructor.
- *
- */
- public TestClientFileGenerator (String inputs, String methods, String results)
- {
- super();
- fInputName = inputs;
- fMethodName = methods;
- fResultName = results;
- }
-
- public void setFileNames(String inputs, String methods, String results)
- {
- fInputName = inputs;
- fMethodName = methods;
- fResultName = results;
- }
-
- //takes in a bean node
- public IStatus visit (Object object)
- {
- fbuffer.append("<%@page contentType=\"text/html;charset=UTF-8\"%>");
- fbuffer.append("<HTML>" + StringUtils.NEWLINE);
- fbuffer.append("<HEAD>" + StringUtils.NEWLINE);
- fbuffer.append("<TITLE>Web Services Test Client</TITLE>" + StringUtils.NEWLINE);
- fbuffer.append("</HEAD>" + StringUtils.NEWLINE + "");
- fbuffer.append("<FRAMESET COLS=\"220,*\">" + StringUtils.NEWLINE);
- fbuffer.append("<FRAME SRC=\""+ fMethodName + "\" NAME=\"methods\" MARGINWIDTH=\"1\" MARGINHEIGHT=\"1\" SCROLLING=\"yes\" FRAMEBORDER=\"1\">" + StringUtils.NEWLINE);
- fbuffer.append("<FRAMESET ROWS=\"80%,20%\">" + StringUtils.NEWLINE);
- fbuffer.append("<FRAME SRC=\""+ fInputName + "\" NAME=\"inputs\" MARGINWIDTH=\"1\" MARGINHEIGHT=\"1\" SCROLLING=\"yes\" FRAMEBORDER=\"1\">" + StringUtils.NEWLINE);
- fbuffer.append("<%").append(StringUtils.NEWLINE);
- fbuffer.append("StringBuffer resultJSP = new StringBuffer(\"").append(fResultName).append("\");").append(StringUtils.NEWLINE);
- fbuffer.append("resultJSP.append(\"?\");").append(StringUtils.NEWLINE);
- fbuffer.append("java.util.Enumeration resultEnum = request.getParameterNames();");
- fbuffer.append("while (resultEnum.hasMoreElements()) {").append(StringUtils.NEWLINE);
- fbuffer.append("Object resultObj = resultEnum.nextElement();").append(StringUtils.NEWLINE);
- fbuffer.append("resultJSP.append(resultObj.toString()).append(\"=\").append(request.getParameter(resultObj.toString())).append(\"&\");").append(StringUtils.NEWLINE);
- fbuffer.append("}").append(StringUtils.NEWLINE);
- fbuffer.append("%>").append(StringUtils.NEWLINE);
- fbuffer.append("<FRAME SRC=\"<%=org.eclipse.jst.ws.util.JspUtils.markup(resultJSP.toString())%>\" NAME=\"result\" MARGINWIDTH=\"1\" MARGINHEIGHT=\"1\" SCROLLING=\"yes\" FRAMEBORDER=\"1\">" + StringUtils.NEWLINE);
- fbuffer.append("</FRAMESET>" + StringUtils.NEWLINE);
-
-
- fbuffer.append("<NOFRAMES>" + StringUtils.NEWLINE);
- fbuffer.append("<BODY>" + StringUtils.NEWLINE);
- fbuffer.append("The Web Services Test Client requires a browser that supports frames." + StringUtils.NEWLINE);
- fbuffer.append("</BODY>" + StringUtils.NEWLINE);
- fbuffer.append("</NOFRAMES>" + StringUtils.NEWLINE);
- fbuffer.append("</FRAMESET>" + StringUtils.NEWLINE);
- fbuffer.append("</HTML>");
-
- return Status.OK_STATUS;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/GeneratePageCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/GeneratePageCommand.java
deleted file mode 100644
index d1d7f87..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/GeneratePageCommand.java
+++ /dev/null
@@ -1,104 +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.consumption.sampleapp.command;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-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.jst.ws.internal.consumption.codegen.Generator;
-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.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-
-/**
- * MofToBeanModelCommand
- * Creation date: (4/10/2001 12:41:48 PM)
- * @author: Gilbert Andrews
- */
-public class GeneratePageCommand extends AbstractDataModelOperation
-{
-
-private Model model_;
-private Generator fGenerator;
-private IFile fIFile;
-private ResourceContext resourceContext_;
-private StringBuffer fStringBuffer;
-
-/**
- * Build constructor comment.
- */
-public GeneratePageCommand()
-{
-}
-
-/**
-* Constructor
-* This command will generate code from a Model
-* @param model The model to be traversed
-* @param generator The code generator to be used
-* @param resource the resource to place the finished product
-*/
-public GeneratePageCommand(ResourceContext context, Model model, Generator generator, IFile file)
-{
- model_ = model;
- fGenerator = generator;
- fIFile = file;
- resourceContext_ = context;
-}
-
-public Model getJavaDataModel()
-{
- return model_;
-}
-
-/**
- *
- */
-public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-{
- IEnvironment env = getEnvironment();
-
- IStatus status = Status.OK_STATUS;
- try {
- fGenerator.visit(model_.getRootElement());
- fStringBuffer = fGenerator.getStringBuffer();
- String tempString = fStringBuffer.toString();
- OutputStream fileResource = FileResourceUtils.newFileOutputStream(resourceContext_, fIFile.getFullPath(), monitor, env.getStatusHandler());
- //PrintStream ps = new PrintStream(fileResource);
- //ps.print(tempString);
- OutputStreamWriter osw = new OutputStreamWriter(fileResource,"UTF-8");
- osw.write(tempString,0,fStringBuffer.length());
- osw.close();
- fileResource.close();
- return status;
- } catch (IOException ioexc) {
- status = StatusUtils.errorStatus( ioexc );
- return status;
- }
-}
-
-public void setRootElement(Element rootElement)
-{
-}
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/JavaToModelCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/JavaToModelCommand.java
deleted file mode 100644
index b408104..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/JavaToModelCommand.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.sampleapp.command;
-
-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.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitoractions.JavaMofBeanVisitorAction;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofBeanVisitor;
-import org.eclipse.jst.ws.internal.consumption.command.common.JavaMofReflectionCommand;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.selection.BooleanSelection;
-import org.eclipse.wst.common.environment.Choice;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-/**
-* This is the base class for commands that need to report progress
-* and status during and after their execution. This class extends
-* {@link org.eclipse.emf.common.command.AbstractCommand AbstractCommand}
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-* with methods to {@link #setProgressMonitor set}
-* and {@link #getProgressMonitor get} a progress monitor,
-* and to get a status object {@link #getReadyStatus before}
-* or {@link #getResultStatus after} execution.
-* <p>
-* Note that the responsibility of providing an
-* {@link org.eclipse.core.runtime.IProgressMonitor IProgressMonitor}
-* rests with frameworks that construct or run ProgressCommand objects,
-* whereas the responsibility of providing an
-* {@link org.eclipse.core.runtime.IStatus IStatus}
-* object lies with the subclasses of ProgressCommand.
-* Subclasses must follow the rules described for
-* {@link org.eclipse.emf.common.command.AbstractCommand AbstractCommand}.
-*/
-public class JavaToModelCommand extends AbstractDataModelOperation
-{
-
- private String clientProject;
- private BooleanSelection[] methods;
- private String proxyBean;
- private JavaClass javaClass;
- private Model model;
- private Element parentElement;
-
- public JavaToModelCommand ()
- {
- }
-
-
- private IStatus createJavaReflection(IEnvironment env, IProgressMonitor monitor )
- {
- IStatus status = Status.OK_STATUS;
- JavaMofReflectionCommand javaMofReflectionCommand = new JavaMofReflectionCommand();
- javaMofReflectionCommand.setClientProject(clientProject);
- javaMofReflectionCommand.setProxyBean(proxyBean);
- javaMofReflectionCommand.setEnvironment( env );
- //javaMofReflectionCommand.setStatusMonitor(getStatusMonitor());
- status = javaMofReflectionCommand.execute( monitor, null);
- javaClass = (JavaClass)javaMofReflectionCommand.getJavaClass();
- return status;
- }
-
- /**
- * The Model that was created from this javamof
- * @return Model The data model that was created
- **/
- public Model getJavaDataModel()
- {
- return model;
- }
-
- /**
- * Build the datamodel from the mof
- */
- public IStatus buildModelFromMof (IEnvironment env) throws CoreException
- {
-
- Choice OKChoice = new Choice('O', ConsumptionMessages.LABEL_OK, ConsumptionMessages.DESCRIPTION_OK);
- Choice CancelChoice = new Choice('C', ConsumptionMessages.LABEL_CANCEL, ConsumptionMessages.DESCRIPTION_CANCEL);
-
- // we could have one of three cases:
- //1. The model is null meaning we want and the parent element is null, meaning we want to
- // create a brand new model and make this bean its root
- //2. The model is null but the parentElement is not, meaning we want to add the Bean to the
- // given parent element
- //3. The model is not null however the parentElement is, meaning we want to add this Bean to
- // This model but dont attach it to anything
- IStatus status = Status.OK_STATUS;
-
- if(model == null && parentElement == null){
- JavaMofBeanVisitorAction beanVisitorAction = new JavaMofBeanVisitorAction(clientProject,methods, env);
- //beanVisitorAction.setStatusMonitor(getStatusMonitor());
- JavaMofBeanVisitor beanVisitor = new JavaMofBeanVisitor();
- status = beanVisitor.run(javaClass,beanVisitorAction);
- //
- int severity = status.getSeverity();
- if (severity==Status.ERROR)
- return status;
-
- if (severity==Status.WARNING)
- {
- Choice result = env.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
- if (result.getLabel().equals(CancelChoice.getLabel()))
- {
- //return an error status since the user canceled
- return StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_SAMPLE_CREATION_CANCELED );
- }
-
- }
- //
- model = beanVisitorAction.getModel();
-
- }
- else if (model == null && parentElement != null){
- JavaMofBeanVisitorAction beanVisitorAction = new JavaMofBeanVisitorAction(parentElement,clientProject, env);
- //beanVisitorAction.setStatusMonitor(getStatusMonitor());
- JavaMofBeanVisitor beanVisitor = new JavaMofBeanVisitor();
- status = beanVisitor.run(javaClass,beanVisitorAction);
- //
- int severity = status.getSeverity();
- if (severity==Status.ERROR)
- return status;
-
- if (severity==Status.WARNING)
- {
- Choice result = env.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
- if (result.getLabel().equals(CancelChoice.getLabel()))
- {
- //return an error status since the user canceled
- return StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_SAMPLE_CREATION_CANCELED );
- }
-
- }
- //
- model = beanVisitorAction.getModel();
- }
- else {
- JavaMofBeanVisitorAction beanVisitorAction = new JavaMofBeanVisitorAction(model,clientProject, env);
- //beanVisitorAction.setStatusMonitor(getStatusMonitor());
- JavaMofBeanVisitor beanVisitor = new JavaMofBeanVisitor();
- status = beanVisitor.run(javaClass,beanVisitorAction);
- //
- int severity = status.getSeverity();
- if (severity==Status.ERROR)
- return status;
-
- if (severity==Status.WARNING)
- {
- Choice result = env.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
- if (result.getLabel().equals(CancelChoice.getLabel()))
- {
- //return an error status since the user canceled
- return StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_SAMPLE_CREATION_CANCELED );
- }
-
- }
- //
- model = beanVisitorAction.getModel();
- }
-
- return status;
- }
-
- /**
- * Get the java model from the resource then
- * build the model from the mof
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
- IStatus status = Status.OK_STATUS;
- if(clientProject == null) return status;
-
- status = createJavaReflection(env, monitor);
- if (status.getSeverity()==Status.ERROR) return status;
- try{
- status = buildModelFromMof(env);
- return status;
- }catch(CoreException exc){
- IStatus embeddedStatus = exc.getStatus();
- status = embeddedStatus;
- return status;
- }
-
- }
-
- public void setMethods(BooleanSelection[] methods)
- {
- this.methods = methods;
- }
-
- public void setClientProject(String clientProject)
- {
- this.clientProject = clientProject;
- }
-
- public void setParentElement(Element parentElement)
- {
- this.parentElement = parentElement;
- }
-
- public void setProxyBean(String proxyBean)
- {
- this.proxyBean = proxyBean;
- }
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/common/SamplePropertyDescriptor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/common/SamplePropertyDescriptor.java
deleted file mode 100644
index 74f4b01..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/common/SamplePropertyDescriptor.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.sampleapp.common;
-
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.Method;
-
-
-/**
-* Objects of this class represent a PropertyDescriptor.
-* */
-public class SamplePropertyDescriptor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- private Method fReadMethod;
- private Method fWriteMethod;
- private String fPropertyName;
- private JavaHelpers fPropertyType;
- private boolean fStatic;
-
- /*
- * Constructor
- **/
- public SamplePropertyDescriptor(String name)
- {
- fPropertyName = name;
- }
-
- /*
- * set the ReadMethod
- */
- public void setReadMethod(Method readMethod)
- {
- fReadMethod = readMethod;
- }
-
- /*
- * get the ReadMethod
- */
- public Method getReadMethod()
- {
- return fReadMethod;
- }
-
- /*
- * set the writeMethod
- */
- public void setWriteMethod(Method writeMethod)
- {
- fWriteMethod = writeMethod;
- }
-
- /*
- * get the writeMethod
- */
- public Method getWriteMethod()
- {
- return fWriteMethod;
- }
-
- /*
- * set the propertyName
- */
- public void setName(String name)
- {
- fPropertyName= name;
- }
-
- /*
- * get the propertyName
- */
- public String getName()
- {
- return fPropertyName;
- }
-
- /*
- * set the PropertyType
- */
- public void setPropertyType(JavaHelpers propertyType)
- {
- fPropertyType = propertyType;
- }
-
- /*
- * get the PropertyType
- */
- public JavaHelpers getPropertyType()
- {
- return fPropertyType;
- }
-
- public boolean isfStatic()
- {
- return fStatic;
- }
-
- public void setfStatic(boolean fStatic)
- {
- this.fStatic = fStatic;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/IWSFinder.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/IWSFinder.java
deleted file mode 100644
index 7ea7ff5..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/IWSFinder.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 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.consumption.wsfinder;
-
-import java.util.List;
-
-public interface IWSFinder
-{
- public String getID();
- public void setID(String id);
-
- public String getName();
- public void setName(String name);
-
- public String getDescription();
- public void setDescription(String desc);
-
- public List find();
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/LiveWSDLFilter.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/LiveWSDLFilter.java
deleted file mode 100644
index 75614bb..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/LiveWSDLFilter.java
+++ /dev/null
@@ -1,99 +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.consumption.wsfinder;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.WSDLException;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.http.HTTPAddress;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WWWAuthenticationException;
-
-public class LiveWSDLFilter extends Thread
-{
- private String wsdlURL_;
- private boolean finish_;
- private boolean live_;
-
- public LiveWSDLFilter(String wsdlURL)
- {
- wsdlURL_ = wsdlURL;
- finish_ = false;
- live_ = false;
- }
-
- public String getWSDLURL()
- {
- return wsdlURL_;
- }
-
- public boolean isFinish()
- {
- return finish_;
- }
-
- public boolean isWSDLLive()
- {
- return live_;
- }
-
- public void run()
- {
- try
- {
- live_ = validateWSDL();
- }
- catch (Throwable t)
- {
- live_ = false;
- }
- finally
- {
- finish_ = true;
- }
- }
-
- private boolean validateWSDL() throws WSDLException, MalformedURLException, IOException, WWWAuthenticationException
- {
- WebServicesParserExt parser = new WebServicesParserExt();
- Definition definition = parser.getWSDLDefinitionVerbose(wsdlURL_);
- Map services = definition.getServices();
- Iterator serviceIterator = services.values().iterator();
- while (serviceIterator.hasNext())
- {
- Service service = (Service)serviceIterator.next();
- Map ports = service.getPorts();
- Iterator portIterator = ports.values().iterator();
- while (portIterator.hasNext())
- {
- Port port = (Port)portIterator.next();
- List extensibilityElements = port.getExtensibilityElements();
- Iterator extensibilityElementsIterator = extensibilityElements.iterator();
- while (extensibilityElementsIterator.hasNext())
- {
- ExtensibilityElement extensibilityElement = (ExtensibilityElement)extensibilityElementsIterator.next();
- if ((extensibilityElement instanceof SOAPAddress) || (extensibilityElement instanceof HTTPAddress))
- return true;
- }
- }
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/WSFinderRegistry.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/WSFinderRegistry.java
deleted file mode 100644
index 1bbf27a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/WSFinderRegistry.java
+++ /dev/null
@@ -1,86 +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.consumption.wsfinder;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-
-public class WSFinderRegistry
-{
- private static WSFinderRegistry instance_;
- private Vector wsfinders_;
-
- private WSFinderRegistry()
- {
- wsfinders_ = new Vector();
- }
-
- /**
- * Returns a singleton instance of this class.
- * @return A singleton WSFinderRegistry object.
- */
- public static WSFinderRegistry getInstance()
- {
- if (instance_ == null)
- {
- instance_ = new WSFinderRegistry();
- instance_.init();
- }
- return instance_;
- }
-
- private void init()
- {
- IExtensionRegistry pluginReg = Platform.getExtensionRegistry();
- IConfigurationElement[] configElements = pluginReg.getConfigurationElementsFor("org.eclipse.jst.ws.consumption", "wsfinder");
- for (int i = 0; i < configElements.length; i++)
- {
- try
- {
- Object object = configElements[i].createExecutableExtension("class");
- if (object instanceof IWSFinder)
- {
- IWSFinder wsfinder = (IWSFinder)object;
- wsfinder.setID(configElements[i].getAttribute("id"));
- wsfinder.setName(configElements[i].getAttribute("name"));
- wsfinder.setDescription(configElements[i].getAttribute("description"));
- wsfinders_.add(wsfinder);
- }
- }
- catch (CoreException ce)
- {
- }
- }
- }
-
- public List getWSFinders()
- {
- return wsfinders_;
- }
-
- public List getWebServices()
- {
- List ws = new Vector();
- List wsFinders = getWSFinders();
- for (Iterator it = wsFinders.iterator(); it.hasNext();)
- {
- IWSFinder wsFinder = (IWSFinder)it.next();
- ws.addAll(wsFinder.find());
- }
- return ws;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/DomElementHelper.java b/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/DomElementHelper.java
deleted file mode 100644
index 97ea2bd..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/DomElementHelper.java
+++ /dev/null
@@ -1,137 +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.util;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import org.w3c.dom.Document;
-
-/**
- * @author gilberta
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class DomElementHelper {
-
-
- public static org.w3c.dom.Element createDomElementFromXMLString(java.lang.String xmlString )
- {
- java.io.StringReader stringReader = new java.io.StringReader(xmlString);
- org.xml.sax.InputSource inputSource = new org.xml.sax.InputSource(stringReader);
- try
- {
- DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
- DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
- Document document = docBuilder.parse(inputSource);
- return document.getDocumentElement();
- }
- catch (Throwable t)
- {
- return null;
- }
- }
-
- public static java.lang.String domWriter(org.w3c.dom.Node node,java.lang.StringBuffer buffer)
- {
- if ( node == null ) {
- return "";
- }
- int type = node.getNodeType();
- switch ( type ) {
- case org.w3c.dom.Node.DOCUMENT_NODE: {
- buffer.append(JspUtils.markup("<?xml version=\"1.0\" encoding=\"UTF-8\"?>") + "<br>");
- domWriter(((org.w3c.dom.Document)node).getDocumentElement(),buffer);
- break;
- }
- case org.w3c.dom.Node.ELEMENT_NODE: {
- buffer.append(JspUtils.markup("<" + node.getNodeName()));
- org.w3c.dom.Attr attrs[] = sortAttributes(node.getAttributes());
- for ( int i = 0; i < attrs.length; i++ ) {
- org.w3c.dom.Attr attr = attrs[i];
- buffer.append(" " + attr.getNodeName() + "=\"" + JspUtils.markup(attr.getNodeValue()) + "\"");
- }
- buffer.append(JspUtils.markup(">"));
- org.w3c.dom.NodeList children = node.getChildNodes();
- if ( children != null ) {
- int len = children.getLength();
- for ( int i = 0; i < len; i++ ) {
- if(((org.w3c.dom.Node)children.item(i)).getNodeType() == org.w3c.dom.Node.ELEMENT_NODE)
- buffer.append("<br>");
- domWriter(children.item(i),buffer);
- }
- }
- buffer.append(JspUtils.markup("</" + node.getNodeName() + ">"));
- break;
- }
- case org.w3c.dom.Node.ENTITY_REFERENCE_NODE: {
- org.w3c.dom.NodeList children = node.getChildNodes();
- if ( children != null ) {
- int len = children.getLength();
- for ( int i = 0; i < len; i++ )
- {
- buffer.append(children.item(i));
- }
- }
- break;
- }
- case org.w3c.dom.Node.CDATA_SECTION_NODE: {
- buffer.append(JspUtils.markup(node.getNodeValue()));
- break;
- }
- case org.w3c.dom.Node.TEXT_NODE:{
- buffer.append(JspUtils.markup(node.getNodeValue()));
- break;
- }
- case org.w3c.dom.Node.PROCESSING_INSTRUCTION_NODE:{
- buffer.append(JspUtils.markup("<?"));
- buffer.append(node.getNodeName());
- String data = node.getNodeValue();
- if ( data != null && data.length() > 0 ){
- buffer.append(" ");
- buffer.append(data);
- }
- buffer.append(JspUtils.markup("?>"));
- break;
- }
- }
- return buffer.toString();
- }
-
- public static org.w3c.dom.Attr[] sortAttributes(org.w3c.dom.NamedNodeMap attrs)
- {
- int len = (attrs != null) ? attrs.getLength() : 0;
- org.w3c.dom.Attr array[] = new org.w3c.dom.Attr[len];
- for ( int i = 0; i < len; i++ ){
- array[i] = (org.w3c.dom.Attr)attrs.item(i);
- }
- for ( int i = 0; i < len - 1; i++ ) {
- String name = array[i].getNodeName();
- int index = i;
- for ( int j = i + 1; j < len; j++ ) {
- String curName = array[j].getNodeName();
- if ( curName.compareTo(name) < 0 ) {
- name = curName;
- index = j;
- }
- }
- if ( index != i ) {
- org.w3c.dom.Attr temp = array[i];
- array[i] = array[index];
- array[index] = temp;
- }
- }
- return (array);
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/JspUtils.java b/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/JspUtils.java
deleted file mode 100644
index abb9013..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/JspUtils.java
+++ /dev/null
@@ -1,50 +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.util;
-
-/**
- * @author gilberta
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class JspUtils {
- public static String markup(String text) {
- if (text == null) {
- return null;
- }
-
- StringBuffer buffer = new StringBuffer();
- for (int i = 0; i < text.length(); i++) {
- char c = text.charAt(i);
- switch (c) {
- case '<':
- buffer.append("<");
- break;
- case '&':
- buffer.append("&");
- break;
- case '>':
- buffer.append(">");
- break;
- case '"':
- buffer.append(""");
- break;
- default:
- buffer.append(c);
- break;
- }
- }
- return buffer.toString();
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementHelper.java b/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementHelper.java
deleted file mode 100644
index 1803006..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementHelper.java
+++ /dev/null
@@ -1,69 +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
- * -------- -------- -----------------------------------------------------------
- * 20060131 123963 andyzhai@ca.ibm.com - Andy Zhai
- *******************************************************************************/
-package org.eclipse.jst.ws.util;
-
-import java.io.IOException;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.xml.sax.SAXException;
-
-/**
- * @author gilberta
- */
-public class SoapElementHelper
-{
- public static javax.xml.soap.SOAPElement createSOAPElementFromXMLString(String xmlString) throws ParserConfigurationException, IOException, SAXException
- {
- java.io.StringReader stringReader = new java.io.StringReader(xmlString);
- org.xml.sax.InputSource inputSource = new org.xml.sax.InputSource(stringReader);
- SAXParserFactory factory = SAXParserFactory.newInstance();
- factory.setNamespaceAware(true);
- SAXParser parser = factory.newSAXParser();
- SoapElementSaxHandler handler = new SoapElementSaxHandler();
- parser.parse(inputSource,handler);
- return handler.getSOAPElement();
- }
-
- public static java.lang.String soapElementWriter(javax.xml.soap.SOAPElement node,java.lang.StringBuffer buffer)
- {
- if (node == null ) {
- return "";
- }
-
- buffer.append(JspUtils.markup("<" + node.getElementName().getLocalName()));
- java.util.Iterator attrs = node.getAllAttributes();
- while(attrs.hasNext()) {
- javax.xml.soap.Name attr = (javax.xml.soap.Name)attrs.next();
- buffer.append(" " + attr.getQualifiedName() + "=\"" + JspUtils.markup(node.getAttributeValue(attr)) + "\"");
- }
- buffer.append(JspUtils.markup(">"));
- java.util.Iterator children = node.getChildElements();
- if ( children != null ) {
- while(children.hasNext()){
- javax.xml.soap.Node childNode = (javax.xml.soap.Node)children.next();
- if(childNode instanceof javax.xml.soap.SOAPElement){
- buffer.append("<br>");
- soapElementWriter((javax.xml.soap.SOAPElement)childNode,buffer);
- }
- else
- buffer.append(JspUtils.markup(((javax.xml.soap.Text)childNode).getValue()));
- }
- buffer.append(JspUtils.markup("</" + node.getElementName().getLocalName() + ">"));
- }
- return buffer.toString();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementRuntimeException.java b/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementRuntimeException.java
deleted file mode 100644
index 0d670fe..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementRuntimeException.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.util;
-
-/**
- * @author gilberta
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class SoapElementRuntimeException extends Exception {
-
- /**
- * Comment for <code>serialVersionUID</code>
- */
- private static final long serialVersionUID = 3761693372674748471L;
-
-public SoapElementRuntimeException(String message){
- super(message);
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementSaxHandler.java b/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementSaxHandler.java
deleted file mode 100644
index ac43cda..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementSaxHandler.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 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
- * -------- -------- -----------------------------------------------------------
- * 20060131 123963 andyzhai@ca.ibm.com - Andy Zhai
- * 20090806 285933 ericdp@ca.ibm.com - Eric D. Peters, SOAPElementSaxHandler to create text nodes results in null return for char size 1
- *******************************************************************************/
-
-package org.eclipse.jst.ws.util;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import javax.xml.soap.Name;
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPFactory;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * @author xinzhai
- */
-public class SoapElementSaxHandler extends DefaultHandler
-{
- //Stores all values of pairs of prefix and URI in the document
- private HashMap prefixURIMapping = new HashMap();
- //Stores a list of URIs for a particular SOAP element
- private ArrayList uris = new ArrayList();
- //Represents the whole(root) SOAP document
- private SOAPElement rootElement = null;
- //Represents the current SOAP element where SAX parser is reading
- private SOAPElement currentElement = null;
- private SOAPFactory soapFactory;
-
- public SOAPElement getSOAPElement()
- {
- return rootElement;
- }
-
- public void startDocument() throws SAXException
- {
- try
- {
- soapFactory = SOAPFactory.newInstance();
- }
- catch (SOAPException e)
- {
- throw new SAXException("Can't create a SOAPFactory instance", e);
- }
- }
-
- public void startPrefixMapping(String prefix, String uri)
- {
- prefixURIMapping.put(uri,prefix);
- uris.add(uri);
- }
-
- public void characters(char[] ch, int start, int length) throws SAXException
- {
- String str = String.valueOf(ch);
- //Add non-trivial text as a text node
- if (length > 0)
- {
- try
- {
- currentElement.addTextNode(str.substring(start,start+length));
- }
- catch (SOAPException e)
- {
- throw new SAXException("Can't add a text node into SOAPElement from text", e);
- }
- }
- }
-
- public void endElement (String uri, String localName, String qName)
- {
- if (currentElement != rootElement )
- {
- currentElement = currentElement.getParentElement();
- }
- }
- public void startElement(String namespaceURI, String localName, String qName, Attributes atts) throws SAXException
- {
- String prefix = (String)prefixURIMapping.get(namespaceURI);
- try
- {
- // Create and/or add child element
- if (rootElement == null && currentElement == null)
- {
- rootElement = soapFactory.createElement(localName,prefix,namespaceURI);
- currentElement = rootElement;
- }
- else
- {
- currentElement = currentElement.addChildElement(localName,prefix,namespaceURI);
- }
-
- // Add namespace declaration
- if (uris.size() > 0)
- {
- for (int i = 0; i < uris.size(); i++)
- {
- String uri = (String)uris.get(i);
- String pre = (String)prefixURIMapping.get(uri);
- currentElement.addNamespaceDeclaration(pre,uri);
- }
- // Need to reset uris as we will use it for next element.
- uris.clear();
- }
-
- // Add attibutes
- for (int i =0; i<atts.getLength(); i++)
- {
- Name attriName;
- if (atts.getURI(i) != null)
- {
- String attriPre = (String)prefixURIMapping.get(atts.getURI(i));
- attriName = soapFactory.createName(atts.getLocalName(i),attriPre,atts.getURI(i));
- }
- else
- {
- attriName = soapFactory.createName(atts.getLocalName(i));
- }
- currentElement.addAttribute(attriName, atts.getValue(i));
- }
- }
- catch (SOAPException e)
- {
- throw new SAXException(e);
- }
- }
-}
-
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 83b0dcd..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.204.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 fd6f91a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/jaxrslibraryproviderconfig/JAXRSLibraryProviderUtil.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2012 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * 20120206 365103 jenyoung@ca.ibm.com - Jennifer Young, JAX-RS configuration UI should have the Update Deployment descriptor check box available
- *******************************************************************************/
-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.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.IJAXRSCoreConstants;
-import org.eclipse.jst.ws.jaxrs.core.internal.JAXRSCorePlugin;
-import org.eclipse.jst.ws.jaxrs.core.internal.Messages;
-
-/**
- * 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 || libraryID.equals(IJAXRSCoreConstants.NO_OP_LIBRARY_ID))
- 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 bfa4199..0000000
--- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSFacetInstallDataModelProvider.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * 20120214 371532 jenyoung@ca.ibm.com - Jennifer Young, [JAXRS] Performance issue since dispose method is not being called
- *******************************************************************************/
-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);
- this.libraryInstallDelegate.dispose();
- }
- 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/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
index 0a4f870..ced3c6d 100644
--- 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
@@ -23,7 +23,6 @@
* 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
* 20120206 365103 jenyoung@ca.ibm.com - Jennifer Young, JAX-RS configuration UI should have the Update Deployment descriptor check box available
- * 20120425 377578 jenyoung@ca.ibm.com - Jennifer Young, The JAX-RS install operation config should be updated whenever there are provider set changes
*******************************************************************************/
package org.eclipse.jst.ws.jaxrs.ui.internal.project.facet;
@@ -612,11 +611,9 @@
}
else if (propertyName.equals(IJAXRSFacetInstallDataModelProperties.LIBRARY_PROVIDER_DELEGATE))
{
- LibraryInstallDelegate librariesInstallDelegate = (LibraryInstallDelegate) getDataModel().getProperty(LIBRARY_PROVIDER_DELEGATE);
- LibraryProviderOperationConfig config = librariesInstallDelegate.getLibraryProviderOperationConfig();
-
if (event.getProperty() != null) {
+ LibraryInstallDelegate librariesInstallDelegate = (LibraryInstallDelegate) getDataModel().getProperty(LIBRARY_PROVIDER_DELEGATE);
String libraryProviderID = librariesInstallDelegate.getLibraryProvider().getId();
ILibraryProvider thisProvider = librariesInstallDelegate.getLibraryProvider();
try {
@@ -627,19 +624,14 @@
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
+
}
+
}
- if (config instanceof JAXRSUserLibraryProviderInstallOperationConfig) {
- JAXRSUserLibraryProviderInstallOperationConfig customConfig = (JAXRSUserLibraryProviderInstallOperationConfig) config;
- customConfig.setModel(getDataModel());
- } else if (config instanceof JAXRSSharedLibraryProviderInstallOperationConfig) {
- JAXRSSharedLibraryProviderInstallOperationConfig customConfig = (JAXRSSharedLibraryProviderInstallOperationConfig) config;
- customConfig.setModel(getDataModel());
- }
}
}
super.propertyChanged(event);
@@ -661,8 +653,6 @@
if (webAppDataModel != null)
webAppDataModel.removeListener(this);
- if (model != null)
- model.removeListener(this);
// jaxrsLibCfgComp.dispose();
super.dispose();
}
